Changeset 18190 for branches/comu-ver2
- Timestamp:
- 2009/07/15 14:39:49 (15 years ago)
- Location:
- branches/comu-ver2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/comu-ver2/data/Smarty/templates/default/admin/design/index.tpl
r18189 r18190 51 51 <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" /> 52 52 <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" /> 53 <label>(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 53 54 </div> 54 55 <!--{assign var="firstflg" value=true}--> … … 72 73 <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" /> 73 74 <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" /> 75 <label>(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 76 74 77 </div> 75 78 <!--{assign var="firstflg" value=true}--> … … 91 94 <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" /> 92 95 <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" /> 96 <label>(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 97 93 98 </div> 94 99 <!--{assign var="firstflg" value=true}--> … … 110 115 <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" /> 111 116 <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" /> 117 <label>(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 118 112 119 </div> 113 120 <!--{assign var="firstflg" value=true}--> … … 136 143 <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" /> 137 144 <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" /> 145 <label>(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 146 138 147 </div> 139 148 <!--{assign var="firstflg" value=true}--> … … 157 166 <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" /> 158 167 <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" /> 168 <label>(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 169 159 170 </div> 160 171 <!--{assign var="firstflg" value=true}--> … … 184 195 <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" /> 185 196 <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" /> 197 <label>(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 198 186 199 </div> 187 200 <!--{assign var="firstflg" value=true}--> -
branches/comu-ver2/data/class/helper/SC_Helper_PageLayout.php
r18189 r18190 53 53 $url = "http://" . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']; 54 54 } 55 55 56 $url2 = preg_replace('|^' . preg_quote(SITE_URL) . '|', '', $url); 56 57 // URLを元にページデザインを取得 … … 61 62 . TEMPLATE_NAME . "/" . $arrPageData[0]['filename'] . ".tpl"; 62 63 } 63 64 64 65 foreach($arrPageData[0] as $key => $val) { 65 66 $debug_message.= "arrPageData[$key]:" . $val . "\n"; … … 124 125 */ 125 126 function lfgetPageData($where = 'page_id <> 0', $where_vals = array()) { 127 126 128 $objQuery = new SC_Query; // DB操作オブジェクト 127 129 $arrRet = array(); // データ取得用 … … 167 169 168 170 // 取得するカラム 169 $col = "target_id, bloc_name, tpl_path, php_path ";171 $col = "target_id, bloc_name, tpl_path, php_path,anywhere"; 170 172 171 173 // 取得するテーブル … … 173 175 174 176 // where文生成 175 $where = " page_id = ?";177 $where = "anywhere = 1 OR page_id = ?"; 176 178 $where_vals[] = $page_id; 177 179 … … 181 183 // SQL実行 182 184 $arrRet = $objQuery->select($col, $table, $where, $where_vals); 183 185 184 186 // 結果を返す 185 187 return $arrRet; … … 198 200 foreach($arrNavi as $key => $val){ 199 201 // 指定された箇所と同じデータだけを取得する 200 if ($target_id == $val['target_id'] ){202 if ($target_id == $val['target_id'] ){ 201 203 if ($val['php_path'] != '') { 202 204 $arrNavi[$key]['php_path'] = HTML_PATH . $val['php_path']; -
branches/comu-ver2/data/class/pages/admin/design/LC_Page_Admin_Design.php
r18189 r18190 79 79 80 80 // ブロック配置用データを取得 81 $sel = ", pos.target_id, pos.bloc_id, pos.bloc_row ";81 $sel = ", pos.target_id, pos.bloc_id, pos.bloc_row ,pos.anywhere"; 82 82 $from = ", dtb_blocposition AS pos"; 83 83 $where = " where "; 84 $where .= " lay.page_id = ? AND "; 85 $where .= "lay.page_id = pos.page_id AND exists (select bloc_id from dtb_bloc as blc where pos.bloc_id = blc.bloc_id) ORDER BY lay.page_id,pos.target_id, pos.bloc_row, pos.bloc_id "; 84 $where .= "( pos.anywhere = 1 OR (lay.page_id = ? AND "; 85 $where .= "lay.page_id = pos.page_id AND exists (select bloc_id from dtb_bloc as blc where pos.bloc_id = blc.bloc_id) )) ORDER BY lay.page_id,pos.target_id, pos.bloc_row, pos.bloc_id "; 86 // $where .= "((lay.page_id = ? AND "; 87 // $where .= "lay.page_id = pos.page_id AND exists (select bloc_id from dtb_bloc as blc where pos.bloc_id = blc.bloc_id) )) ORDER BY lay.page_id,pos.target_id, pos.bloc_row, pos.bloc_id "; 88 86 89 $arrData = array($page_id); 87 90 $arrBlocPos = $this->lfgetLayoutData($sel, $from, $where, $arrData ); 88 91 89 92 // データの存在チェックを行う 90 93 $arrPageData = $objLayout->lfgetPageData("page_id = ?", array($page_id)); … … 143 146 $arrUpdBlocData[$upd_cnt]['target_id'] = $arrTargetFlip[$_POST['target_id_'.$upd_cnt]]; // ターゲットID 144 147 $arrUpdBlocData[$upd_cnt]['top'] = $_POST['top_'.$upd_cnt]; // TOP座標 148 $arrUpdBlocData[$upd_cnt]['anywhere'] = $_POST['anywhere_'.$upd_cnt]; //全ページ適用か 145 149 $arrUpdBlocData[$upd_cnt]['update_url'] = $_SERVER['HTTP_REFERER']; // 更新URL 150 146 151 } 147 152 … … 178 183 $ins_sql .= " ,? "; // ブロックの並び順序 179 184 $ins_sql .= " ,(SELECT filename FROM dtb_bloc WHERE bloc_id = ?) "; // ファイル名称 185 $ins_sql .= " ,? "; // 全ページフラグ 180 186 $ins_sql .= " ) "; 181 187 182 188 // insertデータ生成 183 189 $arrInsData = array($page_id, … … 185 191 $arrUpdBlocData[$key]['id'], 186 192 $arrUpdBlocData[$key]['bloc_row'], 187 $arrUpdBlocData[$key]['id'] 193 $arrUpdBlocData[$key]['id'], 194 $arrUpdBlocData[$key]['anywhere'] 188 195 ); 196 $count = $objDBConn->getOne("SELECT COUNT(*) FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ?",array($arrUpdBlocData[$key]['id'])); 197 198 if($arrUpdBlocData[$key]['anywhere'] == 1){ 199 $count = $objDBConn->getOne("SELECT COUNT(*) FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ?",array($arrUpdBlocData[$key]['id'])); 200 $objDBConn->getLastQuery(); 201 if($count != 0){ 202 continue; 203 }else{ 204 } 205 }else{ 206 if($count > 0){ 207 $objDBConn->query("DELETE FROM dtb_blocposition WHERE anywhere = 1 AND bloc_id = ?",array($arrUpdBlocData[$key]['id'])); 208 } 209 } 189 210 // SQL実行 190 211 $arrRet = $objDBConn->query($ins_sql,$arrInsData); … … 228 249 $tpl_arrBloc = $this->lfSetBlocData($arrBloc, $val, $tpl_arrBloc, $cnt); 229 250 $cnt++; 230 } 231 } 232 251 }else{ 252 } 253 } 254 255 233 256 // 未使用のブロックデータを追加 234 257 foreach($arrBloc as $key => $val){ 235 258 if (!$this->lfChkBloc($val, $tpl_arrBloc)) { 236 $val['target_id'] = 5; // 未使用に追加する259 $val['target_id'] = 7; // 未使用に追加する 237 260 $tpl_arrBloc = $this->lfSetBlocData($arrBloc, $val, $tpl_arrBloc, $cnt); 238 261 $cnt++; 262 }else{ 239 263 } 240 264 } … … 374 398 $tpl_arrBloc[$cnt]['bloc_row'] = 375 399 isset($val['bloc_row']) ? $val['bloc_row'] : ""; 376 400 $tpl_arrBloc[$cnt]['anywhere'] = $val['anywhere']; 401 if($val['anywhere'] == 1){ 402 $tpl_arrBloc[$cnt]['anywhere_selected'] = 'checked="checked"'; 403 } 377 404 foreach($arrBloc as $bloc_key => $bloc_val){ 378 405 if ($bloc_val['bloc_id'] == $val['bloc_id']) { … … 382 409 } 383 410 $tpl_arrBloc[$cnt]['name'] = $bloc_name; 384 411 385 412 return $tpl_arrBloc; 386 413 } … … 400 427 } 401 428 } 402 429 403 430 // 配列に存在しなければFlaseを返す 404 431 return false; … … 437 464 $arrUpdData = array(); // 更新データ生成用 438 465 $filename = $arrPageData[0]['filename']; 439 466 440 467 $arrPreData = $objLayout->lfgetPageData(" page_id = ? " , array("0")); 441 468 … … 480 507 $sql .= " ,tpl_dir = ?"; 481 508 $sql .= " ,filename = ?"; 509 $sql .= " ,anywhere = ?"; 482 510 $sql .= " where page_id = 0"; 483 511 … … 488 516 ,USER_DIR . "templates/" . TEMPLATE_NAME . "/" 489 517 ,$filename 518 490 519 ); 491 520 -
branches/comu-ver2/html/install/sql/create_table_mysql.sql
r18069 r18190 901 901 bloc_id int, 902 902 bloc_row int, 903 filename text 903 filename text, 904 anywhere int 904 905 ) TYPE=InnoDB ; 905 906 -
branches/comu-ver2/html/install/sql/create_table_pgsql.sql
r18023 r18190 929 929 bloc_id int4, 930 930 bloc_row int4, 931 filename text 931 filename text, 932 anywhere int2 932 933 ); 933 934 -
branches/comu-ver2/html/install/sql/insert_data.sql
r18189 r18190 24 24 update dtb_pagelayout set page_id = 0 where page_id = 5; 25 25 26 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (1,1,1,2,'category');27 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (1,1,2,3,'guide');28 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (1,1,3,1,'cart');29 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (1,3,4,2,'search_products');30 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (1,4,5,1,'news');31 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (1,3,6,1,'login');32 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (1,4,7,2,'best5');33 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (2,1,1,2,'category');34 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (2,1,2,3,'guide');35 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (2,1,3,1,'cart');36 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (2,7,4,0,'search_products');37 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (2,7,5,0,'news');38 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (2,7,6,0,'login');39 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (2,7,7,0,'best5');40 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (3,1,1,2,'category');41 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (3,1,2,3,'guide');42 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (3,1,3,1,'cart');43 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (3,7,4,0,'search_products');44 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (3,7,5,0,'news');45 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (3,7,6,0,'login');46 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename ) VALUES (3,7,7,0,'best5');26 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (1,1,1,2,'category',0); 27 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (1,1,2,3,'guide',0); 28 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (1,1,3,1,'cart',0); 29 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (1,3,4,2,'search_products',0); 30 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (1,4,5,1,'news',0); 31 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (1,3,6,1,'login',0); 32 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (1,4,7,2,'best5',0); 33 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (2,1,1,2,'category',0); 34 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (2,1,2,3,'guide',0); 35 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (2,1,3,1,'cart',0); 36 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (2,7,4,0,'search_products',0); 37 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (2,7,5,0,'news',0); 38 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (2,7,6,0,'login',0); 39 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (2,7,7,0,'best5',0); 40 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (3,1,1,2,'category',0); 41 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (3,1,2,3,'guide',0); 42 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (3,1,3,1,'cart',0); 43 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (3,7,4,0,'search_products',0); 44 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (3,7,5,0,'news',0); 45 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (3,7,6,0,'login',0); 46 INSERT INTO dtb_blocposition (page_id,target_id,bloc_id,bloc_row,filename,anywhere) VALUES (3,7,7,0,'best5',0); 47 47 48 48 INSERT INTO dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) VALUES (1,'product_id','商品ID',1,now(),now());
Note: See TracChangeset
for help on using the changeset viewer.