Changeset 19755 for branches/version-2_5-dev/data/class

Timestamp:

2010/12/21 21:08:59 (16 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19754

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/order/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Findex.tpl
data/Smarty/templates/admin/order/status.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fstatus.tpl
data/Smarty/templates/admin/products/product_class.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class.tpl
data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/pages/admin/products/LC_Page_Admin_Products_Class.php 15481@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Class.php
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 15559@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductClass.php
html/user_data/packages/admin/js/admin.js 18900@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fhtml%2Fuser_data%2Fpackages%2Fadmin%2Fjs%2Fadmin.js

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2484

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-12-21 21:08:52.874000072 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-12-21T12:08:52.874000Z

Message:

• #855(SC_Query の #select, #getRow, #getCol, #get, #min, #max の引数順を統一する)
  • 関数内部の SC_Query::get() を修正
• #781 (規格のデータベースを木構造に)
  • 規格1のみの登録ができなかったのを修正
• #382(管理画面XHTMLに変更)
  • チェックボックスの全選択を統一
• #854(PHP4対応)
  • 構文修正

Location:

branches/version-2_5-dev/data/class

Files:

• SC_Query.php (modified) (2 diffs)
• pages/admin/products/LC_Page_Admin_Products_Class.php (modified) (5 diffs)
• pages/admin/products/LC_Page_Admin_Products_ProductClass.php (modified) (4 diffs)

branches/version-2_5-dev/data/class/SC_Query.php

@@ -547 +547 @@
      */
     function max($col, $table, $where = "", $arrval = array()) {
-        $ret = $this->get($table, "MAX($col)", $where, $arrval);
+        $ret = $this->get("MAX($col)", $table, $where, $arrval);
         return $ret;
     }
@@ -561 +561 @@
      */
     function min($col, $table, $where = "", $arrval = array()) {
-        $ret = $this->get($table, "MIN($col)", $where, $arrval);
+        $ret = $this->get("MIN($col)", $table, $where, $arrval);
         return $ret;
     }

branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php

@@ -68 +68 @@
     function action() {
         $objSess = new SC_Session();
-        $objQuery = new SC_Query();
+        $objQuery =& SC_Query::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();
 
@@ -102 +102 @@
         case 'delete':
             $objDb->sfDeleteRankRecord("dtb_class", "class_id", $_POST['class_id'], "", true);
-            $objQuery = new SC_Query();
             $objQuery->delete("dtb_classcategory", "class_id = ?", $_POST['class_id']);
             // 再表示
@@ -149 +148 @@
     /* DBへの挿入 */
     function lfInsertClass($arrData) {
-        $objQuery = new SC_Query();
+        $objQuery =& SC_Query::getSingletonInstance();
         // INSERTする値を作成する。
         $sqlval['name'] = $arrData['name'];
@@ -165 +164 @@
     /* DBへの更新 */
     function lfUpdateClass($arrData) {
-        $objQuery = new SC_Query();
+        $objQuery =& SC_Query::getSingletonInstance();
         // UPDATEする値を作成する。
         $sqlval['name'] = $arrData['name'];
@@ -195 +194 @@
 
         if(!isset($objErr->arrErr['name'])) {
-            $objQuery = new SC_Query();
+            $objQuery =& SC_Query::getSingletonInstance();
             $arrRet = $objQuery->select("class_id, name", "dtb_class", "del_flg = 0 AND name = ?", array($_POST['name']));
             // 編集中のレコード以外に同じ名称が存在する場合

branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php

@@ -514 +514 @@
         if (NOSTOCK_HIDDEN === true) {
             // 件数カウントバッチ実行
-            //$objDb->sfCategory_Count($objQuery);
+            $objDb->sfCategory_Count($objQuery);
         }
     }
@@ -535 +535 @@
         if(SC_Utils_Ex::isBlank($class_id2)) {
             $table = "dtb_classcategory T1 ";
-            $objQuery->setWhere("T1.class_id = ?")
-                     ->setOrder("T1.rank DESC");
+            $objQuery->setWhere("T1.class_id = ?");
+            $objQuery->setOrder("T1.rank DESC");
             $val = array($class_id1);
         } else {
@@ -545 +545 @@
                 . "T2.rank AS rank2";
             $table = "dtb_classcategory AS T1, dtb_classcategory AS T2";
-            $objQuery->setWhere("T1.class_id = ? AND T2.class_id = ?")
-                     ->setOrder("T1.rank DESC, T2.rank DESC");
+            $objQuery->setWhere("T1.class_id = ? AND T2.class_id = ?");
+            $objQuery->setOrder("T1.rank DESC, T2.rank DESC");
             $val = array($class_id1, $class_id2);
         }
@@ -617 +617 @@
     function getProductsClass($product_id) {
         $objQuery =& SC_Query::getSingletonInstance();
-        return $objQuery->getRow("*", "dtb_products_class", "product_id = ?", array($product_id));
+        $col = <<< __EOS__
+            product_id, product_code, price01, price02, stock,
+            stock_unlimited, point_rate
+__EOS__;
+        return $objQuery->getRow($col, "dtb_products_class", "product_id = ?", array($product_id));
     }