dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// #PSFV-94 : Update and bug fix with new toolbar implementation

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9873 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dSevere committed 2011-11-04 09:19:50 +00:00
1 parent e5a66e4f95
commit 7a412e08ef
4 files changed
+18 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/template/helper/list/list_header.tpl
+11 -10
View File
@@ -55,16 +55,17 @@
}); });
}); });
</script> </script>
{if $show_toolbar}
<div class="pageTitle">
<h3>{block name=pageTitle}
<span id="current_obj" style="font-weight: normal;">{$page_title|default:'&nbsp;'}</span>
{/block}</h3>
</div>
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
{/if}
{/if}{* End if simple_header *} {/if}{* End if simple_header *}
{if $show_toolbar}
<div class="pageTitle">
<h3>{block name=pageTitle}
<span id="current_obj" style="font-weight: normal;">{$page_title|default:'&nbsp;'}</span>
{/block}</h3>
</div>
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
{/if}
<a name="{$table}">&nbsp;</a> <a name="{$table}">&nbsp;</a>
@@ -112,7 +113,7 @@
<col width="10px" /> <col width="10px" />
{foreach $fields_display AS $key => $params} {foreach $fields_display AS $key => $params}
<col {if isset($params.width) && $params.width != 'auto'}width="{$params.width}px"{/if}/> <col {if isset($params.width) && $params.width != 'auto'}width="{$params.width}px"{/if}/>
{/foreach} {/foreach}
{if $shop_link_type} {if $shop_link_type}
<col width="80px" /> <col width="80px" />
{/if} {/if}
classes/AdminController.php
+2 -2
View File
@@ -1188,8 +1188,8 @@ class AdminControllerCore extends Controller
* @return void * @return void
*/ */
public function setHelperListDisplay(Helper $helper) public function setHelperListDisplay(Helper $helper)
{ {
// @todo : move that in Helper // @todo : move that in Helper
$helper->actions = $this->actions; $helper->actions = $this->actions;
$helper->simple_header = $this->list_simple_header; $helper->simple_header = $this->list_simple_header;
$helper->title = $this->toolbar_title; $helper->title = $this->toolbar_title;
classes/HelperList.php
+4 -4
View File
@@ -347,8 +347,8 @@ class HelperListCore extends Helper
'current_index' => $this->currentIndex, 'current_index' => $this->currentIndex,
'view' => in_array('view', $this->actions), 'view' => in_array('view', $this->actions),
'edit' => in_array('edit', $this->actions), 'edit' => in_array('edit', $this->actions),
'has_actions' => (bool)count($this->actions), 'has_actions' => !empty($this->actions),
'has_bulk_actions' => (bool)count($this->bulk_actions), 'has_bulk_actions' => !empty($this->bulk_actions),
'list_skip_actions' => $this->list_skip_actions, 'list_skip_actions' => $this->list_skip_actions,
)); ));
return $this->content_tpl->fetch(); return $this->content_tpl->fetch();
@@ -591,8 +591,8 @@ class HelperListCore extends Helper
'identifier' => $this->identifier, 'identifier' => $this->identifier,
'id_cat' => $id_cat, 'id_cat' => $id_cat,
'shop_link_type' => $this->shopLinkType, 'shop_link_type' => $this->shopLinkType,
'has_actions' => (bool)count($this->actions), 'has_actions' => !empty($this->actions),
'has_bulk_actions' => (bool)count($this->bulk_actions), 'has_bulk_actions' => !empty($this->bulk_actions),
'toolbar_btn' => $this->toolbar_btn, 'toolbar_btn' => $this->toolbar_btn,
'table_id' => isset($table_id) ? $table_id : null, 'table_id' => isset($table_id) ? $table_id : null,
'table_dnd' => isset($table_dnd) ? $table_dnd : null, 'table_dnd' => isset($table_dnd) ? $table_dnd : null,
controllers/admin/AdminStockMvtController.php
+1
View File
@@ -199,6 +199,7 @@ class AdminStockMvtControllerCore extends AdminController
$this->table = 'stock_mvt'; $this->table = 'stock_mvt';
$this->className = 'StockMvt'; $this->className = 'StockMvt';
$this->identifier = 'id_stock_mvt'; $this->identifier = 'id_stock_mvt';
$this->show_toolbar = false;
$this->lang = false; $this->lang = false;
// test if a filter is applied for this list // test if a filter is applied for this list