Changeset 16598

Timestamp:

2007/10/29 20:29:57 (16 years ago)

Author:

nanasess

Message:

デグレ修正

Location:

branches/feature-module-update/data/class

Files:

• helper/SC_Helper_DB.php (modified) (2 diffs)
• pages/admin/products/LC_Page_Admin_Products_ProductRank.php (modified) (3 diffs)

branches/feature-module-update/data/class/helper/SC_Helper_DB.php

@@ -1149 +1149 @@
         // 自身のランクを取得する
         $rank = $objQuery->get($tableName, "rank", "$keyIdColumn = ?", array($keyId));
-        $max = $objQuery->max($tableName, "rank", $where, array($keyId));
+
+        $max = $objQuery->max($tableName, "rank", $where);
 
         // 値の調整（逆順）
@@ -1160 +1161 @@
         }
 
-        if( $position > $rank ) $term = "rank - 1"; //入れ替え先の順位が入れ換え元の順位より大きい場合
-        if( $position < $rank ) $term = "rank + 1"; //入れ替え先の順位が入れ換え元の順位より小さい場合
+        //入れ替え先の順位が入れ換え元の順位より大きい場合
+        if( $position > $rank ) $term = "rank - 1";
+
+        //入れ替え先の順位が入れ換え元の順位より小さい場合
+        if( $position < $rank ) $term = "rank + 1";
+
+        // XXX 入れ替え先の順位が入れ替え元の順位と同じ場合
+        if (!isset($term)) $term = "rank";
 
         // 指定した順位の商品から移動させる商品までのrankを１つずらす

branches/feature-module-update/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php

@@ -69 +69 @@
         // 通常時は親カテゴリを0に設定する。
         $this->arrForm['parent_category_id'] =
-            isset($_POST['parent_category_id']) ? $_POST['parent_category_id'] : "";
+            isset($_POST['parent_category_id']) ? $_POST['parent_category_id'] : 0;
 
         if (!isset($_POST['mode'])) $_POST['mode'] = "";
@@ -86 +86 @@
             if(SC_Utils_Ex::sfIsInt($input_pos)) {
                 $where = "category_id = " . SC_Utils_Ex::sfQuoteSmart($_POST['parent_category_id']);
-                $objDb->sfMoveRank("dtb_product_categories", "product_id", $_POST['product_id'], $input_pos, "category_id = ?");
+                $objDb->sfMoveRank("dtb_product_categories", "product_id", $_POST['product_id'], $input_pos, $where);
             }
             break;
@@ -137 +137 @@
         $objQuery->setorder("rank DESC");
 
-        // viewも絞込みをかける(mysql用)
-        //sfViewWhere("&&noncls_where&&", $where, array($category_id), $objQuery->order . " " .  $objQuery->setlimitoffset(SEARCH_PMAX, $startno, true)); TODO
-
         $arrRet = $objQuery->select($col, $table, $where, array($category_id));
         return $arrRet;