Changeset 19956

Timestamp:

2011/01/18 16:17:10 (12 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/admin/contents/recomend.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fcontents%2Frecomend.tpl
data/class/pages/admin/products/LC_Page_Admin_Products_Review.php 15537@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Review.php
data/class/pages/products/LC_Page_Products_Review.php 15173@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Review.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110118071336-8sl0bvtw9h9wmr34

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110118071706-3yn4r2r239x374sf

bzr:revno:

2685

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/pages/admin/products/LC_Page_Admin_Products_Review.php ohkouchi@loop-az.jp-20110118071336-8sl0bvtw9h9wmr34
data/class/pages/products/LC_Page_Products_Review.php ohkouchi@loop-az.jp-20110118071336-8sl0bvtw9h9wmr34

bzr:timestamp:

2011-01-18 16:17:06.540999889 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-18T07:17:06.541000Z

Message:

#881(冗長な tpl_mainpage の削除)

• r19788 のデグレ修正

#382(管理画面XHTMLに変更)

• おすすめ商品登録を修正

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/admin/contents/recomend.tpl (modified) (2 diffs)
• class/pages/admin/products/LC_Page_Admin_Products_Review.php (modified) (1 diff)
• class/pages/products/LC_Page_Products_Review.php (modified) (2 diffs)

branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend.tpl

@@ -41 +41 @@
   } else {
     if(window.confirm('内容を登録しても宜しいですか')){
-      return true;
+        fm.submit();
+        return true;
     }
   }
@@ -103 +104 @@
         <textarea name="comment" cols="45" rows="4" style="width: 337px; height: 82px; <!--{$arrErr[$smarty.section.cnt.iteration].comment|sfGetErrorColor}-->" <!--{$arrItems[$smarty.section.cnt.iteration].product_id|sfGetEnabled}-->><!--{$arrItems[$smarty.section.cnt.iteration].comment}--></textarea>
         <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-        <br /><a class="btn-action" href="javascript:;" onclick="return lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->); return false;"><span class="btn-next">登録する</span></a>
+        <br /><a class="btn-action" href="javascript:;" onclick="return lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->);"><span class="btn-next">登録する</span></a>
         <!--{/if}-->
         </form>

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

@@ -265 +265 @@
                 $data = $objCSV->lfGetReviewCSV($where, '', $arrval);
                 // CSVを送信する。
-                SC_Utils_Ex::sfCSVDownload($head.$data);
+                list($fime_name, $data) = SC_Utils_Ex::sfGetCSVData($head.$data);
+                $this->sendResponseCSV($fime_name, $data);
                 exit;
             }

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

@@ -60 +60 @@
         $this->arrSex = $masterData->getMasterData("mtb_sex");
         $this->arrReviewDenyURL = $masterData->getMasterData("mtb_review_deny_url");
+        $this->tpl_mainpage = 'products/review.tpl';
         $this->httpCacheControl('nocache');
     }
@@ -177 +178 @@
 
         $this->transactionid = SC_Helper_Session_Ex::getToken();
-        $this->setTemplate('products/review.tpl');
+        $this->setTemplate($this->tpl_mainpage);
     }