Changeset 23542 for branches/version-2_13-dev/data/class/pages/admin

Timestamp:

2014/06/11 13:42:24 (12 years ago)

Author:

h_yoshimoto

Message:

#2578 version-2_13_2の内容をdevにmerge
r23408,r23412,r23420

Location:

branches/version-2_13-dev/data/class/pages/admin

Files:

• LC_Page_Admin_Home.php (modified) (1 diff)
• products/LC_Page_Admin_Products_Maker.php (modified) (1 diff)

branches/version-2_13-dev/data/class/pages/admin/LC_Page_Admin_Home.php

@@ -252 +252 @@
 
         $objQuery->setOrder('order_detail_id');
-        $objQuery->setLimit(1);
-        $sql_product_name = $objQuery->getSqlWithLimitOffset('product_name', 'dtb_order_detail', 'order_id = dtb_order.order_id');
+        $sql_product_name = $objQuery->getSql('product_name', 'dtb_order_detail', 'order_id = dtb_order.order_id');
+        $sql_product_name = $objQuery->dbFactory->addLimitOffset($sql_product_name, 1);
 
         $cols = <<< __EOS__

branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php

@@ -101 +101 @@
                         // 完了メッセージ
                         $this->tpl_onload = "alert('登録が完了しました。');";
+                        SC_Response_Ex::reload();
+                    } else {
+                        $this->arrErr['maker_id'] = '登録に失敗しました。';
                     }
                 }
-                SC_Response_Ex::reload();
                 break;