[Svn-src-all:868] [version-2_5-dev 19755] * #855(SC_Query の #select, #getRow, #getCol, #get, #min, #max の引数順を統一する)
nanasess
admin ＠ mail.ec-cube.net
2010年 12月 21日 (火) 21:08:59 JST
Subversion committed to /home/svn/open 19755
http://svn.ec-cube.net/open_trac/changeset/19755
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2010-12-21 21:08:59 +0900 (火, 21 12月 2010)│
└────────────────────────────┘
Log:
--------------------------------------------------------
* #855(SC_Query の #select, #getRow, #getCol, #get, #min, #max の引数順を統一する)
* 関数内部の SC_Query::get() を修正
* #781 (規格のデータベースを木構造に)
* 規格1のみの登録ができなかったのを修正
* #382(管理画面XHTMLに変更)
* チェックボックスの全選択を統一
* #854(PHP4対応)
* 構文修正
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl
U branches/version-2_5-dev/data/class/SC_Query.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
U branches/version-2_5-dev/html/user_data/packages/admin/js/admin.js
変更: branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl 2010-12-21 06:21:39 UTC (rev 19754)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl 2010-12-21 12:08:59 UTC (rev 19755)
@@ -75,16 +75,6 @@
fm.mode.value = tmpMode;
fm.action = tmpAction;
}
-
- $(function() {
- $('#pdf_check').change(function() {
- if ($(this).attr('checked')) {
- $('input[name=pdf_order_id[]]').attr('checked', true);
- } else {
- $('input[name=pdf_order_id[]]').attr('checked', false);
- }
- });
- });
//-->
</script>
<div id="order" class="contents-main">
@@ -322,7 +312,7 @@
<th>購入金額(円)</th>
<th>全商品発送日</th>
<th>対応状況</th>
- <th><label for="pdf_check">帳票</label> <input type="checkbox" name="pdf_check" id="pdf_check" /></th>
+ <th><label for="pdf_check">帳票</label> <input type="checkbox" name="pdf_check" id="pdf_check" onclick="fnAllCheck(this, 'input[name=pdf_order_id[]]')" /></th>
<th>編集</th>
<th>メール</th>
<th>削除</th>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl 2010-12-21 06:21:39 UTC (rev 19754)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl 2010-12-21 12:08:59 UTC (rev 19755)
@@ -21,18 +21,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
*}-->
-<script type="text/javascript">//<![CDATA[
- $(function() {
- $('#move_check').change(function() {
- if ($(this).attr('checked')) {
- $('input[name=move[]]').attr('checked', true);
- } else {
- $('input[name=move[]]').attr('checked', false);
- }
- });
- });
-//]]>
-</script>
<form name="form1" id="form1" method="POST" action="?" >
<input type="hidden" name="mode" value="" />
<input type="hidden" name="status" value="<!--{if $arrForm.status == ""}-->1<!--{else}--><!--{$arrForm.status}--><!--{/if}-->" />
@@ -76,7 +64,7 @@
<table class="list center">
<tr>
- <th><label for="move_check">選択</label> <input type="checkbox" name="move_check" id="move_check" /></th>
+ <th><label for="move_check">選択</label> <input type="checkbox" name="move_check" id="move_check" onclick="fnAllCheck(this, 'input[name=move[]]')" /></th>
<th>対応状況</th>
<th>注文番号</th>
<th>受注日</th>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl 2010-12-21 06:21:39 UTC (rev 19754)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl 2010-12-21 12:08:59 UTC (rev 19755)
@@ -82,8 +82,6 @@
<!--{/foreach}-->
<div class="btn">
- <button type="button" onclick="fnAllCheck(); return false;"><span>全選択</span></button>
- <button type="button" onclick="fnAllUnCheck(); return false;"><span>全解除</span></button>
<button type="button" onclick="fnCopyValue('<!--{$cnt}-->', '<!--{$smarty.const.DISABLED_RGB}-->'); return false;"><span>一行目のデータをコピーする</span></button>
</div>
@@ -93,15 +91,15 @@
<input type="hidden" name="class_id2" value="<!--{$class_id2}-->" />
<table class="list">
<tr>
- <th>登録</th>
+ <th><label for="allCheck">登録</label> <input type="checkbox" onclick="fnAllCheck(this, 'input[name^=check]')" id="allCheck" /></th>
<th>規格1(<!--{$arrClass[$class_id1]|default:"未選択"}-->)</th>
<th>規格2(<!--{$arrClass[$class_id2]|default:"未選択"}-->)</th>
<th>商品コード</th>
<th>在庫数<span class="attention">*</span></th>
<th><!--{$smarty.const.NORMAL_PRICE_TITLE}-->(円)</th>
<th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)<span class="attention">*</span></th>
- <th>商品種別<span class="attention"> *</span></th>
- <th>支払方法<span class="attention"> *</span></th>
+ <th>商品種別<span class="attention">*</span></th>
+ <th><label for="allPaymentIds">支払方法</label><span class="attention">*</span> <input type="checkbox" name="allPaymentIds" onclick="fnAllCheck(this, 'input[name^=payment_ids]')" /></th>
<th>ダウンロードファイル名<BR><span class="red"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span></th>
<th>ダウンロード商品用ファイルアップロード<BR>登録可能拡張子：<!--{$smarty.const.DOWNLOAD_EXTENSION}--> (パラメータ DOWNLOAD_EXTENSION)</th>
</tr>
変更: branches/version-2_5-dev/data/class/SC_Query.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Query.php 2010-12-21 06:21:39 UTC (rev 19754)
+++ branches/version-2_5-dev/data/class/SC_Query.php 2010-12-21 12:08:59 UTC (rev 19755)
@@ -546,7 +546,7 @@
* @return integer MAX文の実行結果
*/
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;
}
@@ -560,7 +560,7 @@
* @return integer MIN文の実行結果
*/
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
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php 2010-12-21 06:21:39 UTC (rev 19754)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php 2010-12-21 12:08:59 UTC (rev 19755)
@@ -67,7 +67,7 @@
*/
function action() {
$objSess = new SC_Session();
- $objQuery = new SC_Query();
+ $objQuery =& SC_Query::getSingletonInstance();
$objDb = new SC_Helper_DB_Ex();
// 認証可否の判定
@@ -101,7 +101,6 @@
// 削除
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']);
// 再表示
$this->objDisplay->reload();
@@ -148,7 +147,7 @@
/* DBへの挿入 */
function lfInsertClass($arrData) {
- $objQuery = new SC_Query();
+ $objQuery =& SC_Query::getSingletonInstance();
// INSERTする値を作成する。
$sqlval['name'] = $arrData['name'];
$sqlval['creator_id'] = $_SESSION['member_id'];
@@ -164,7 +163,7 @@
/* DBへの更新 */
function lfUpdateClass($arrData) {
- $objQuery = new SC_Query();
+ $objQuery =& SC_Query::getSingletonInstance();
// UPDATEする値を作成する。
$sqlval['name'] = $arrData['name'];
$sqlval['update_date'] = "Now()";
@@ -194,7 +193,7 @@
$objErr->doFunc(array("規格名", "name", STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
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']));
// 編集中のレコード以外に同じ名称が存在する場合
if ($arrRet[0]['class_id'] != $_POST['class_id'] && $arrRet[0]['name'] == $_POST['name']) {
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 2010-12-21 06:21:39 UTC (rev 19754)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 2010-12-21 12:08:59 UTC (rev 19755)
@@ -513,7 +513,7 @@
// 在庫無し商品の非表示対応
if (NOSTOCK_HIDDEN === true) {
// 件数カウントバッチ実行
- //$objDb->sfCategory_Count($objQuery);
+ $objDb->sfCategory_Count($objQuery);
}
}
@@ -534,8 +534,8 @@
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 {
$col .= ","
@@ -544,8 +544,8 @@
. "T2.name AS name2,"
. "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);
}
return $objQuery->select($col, $table, "", $val);
@@ -616,7 +616,11 @@
*/
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));
}
/**
変更: branches/version-2_5-dev/html/user_data/packages/admin/js/admin.js
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/admin/js/admin.js 2010-12-21 06:21:39 UTC (rev 19754)
+++ branches/version-2_5-dev/html/user_data/packages/admin/js/admin.js 2010-12-21 12:08:59 UTC (rev 19755)
@@ -213,26 +213,14 @@
}
}
-function fnAllCheck() {
- cnt = 1;
- name = "check:" + cnt;
- while (document.form1[name]) {
- document.form1[name].checked = true;
- cnt++;
- name = "check:" + cnt;
- }
+function fnAllCheck(input, selector) {
+ if ($(input).attr('checked')) {
+ $(selector).attr('checked', true);
+ } else {
+ $(selector).attr('checked', false);
+ }
}
-function fnAllUnCheck() {
- cnt = 1;
- name = "check:" + cnt;
- while (document.form1[name]) {
- document.form1[name].checked = false;
- cnt++;
- name = "check:" + cnt;
- }
-}
-
//指定されたidの削除を行うページを実行する。
function fnDelete(url) {
if(window.confirm('登録内容を削除しても宜しいでしょうか')){
@@ -441,4 +429,4 @@
fnChangeDisabled(list, '');
}
}
-}
\ No newline at end of file
+}
Svn-src-all メーリングリストの案内