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

[-] BO : fixed sav display message in hard coded html span #PSTEST-545

Browse Source
This commit is contained in:
vAugagneur
2012-01-27 09:33:48 +00:00
parent c7b86c74b9
commit 94f7f5e8e8
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helper/list/list_content.tpl
+5 -1
View File
@@ -101,7 +101,11 @@
{elseif isset($tr.$key) && $key == 'color'} {elseif isset($tr.$key) && $key == 'color'}
<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div> <div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
{elseif isset($tr.$key)} {elseif isset($tr.$key)}
{$tr.$key|escape:'htmlall':'UTF-8'} {if isset($params.maxlength) && Tools::strlen($tr.$key) > $params.maxlength}
<span title="{$tr.$key|escape:'htmlall':'UTF-8'}">{$tr.$key|truncate:$params.maxlength:'...'|escape:'htmlall':'UTF-8'}</span>
{else}
{$tr.$key|escape:'htmlall':'UTF-8'}
{/if}
{else} {else}
-- --
{/if} {/if}
classes/helper/HelperList.php
+1 -7
View File
@@ -295,13 +295,7 @@ class HelperListCore extends Helper
$this->_list[$index][$key] = Tools::displayDate($tr[$key], $this->context->language->id, true); $this->_list[$index][$key] = Tools::displayDate($tr[$key], $this->context->language->id, true);
else if (isset($tr[$key])) else if (isset($tr[$key]))
{ {
if ($key == 'price') $echo = $tr[$key];
$echo = round($tr[$key], 2);
else if (isset($params['maxlength']) && Tools::strlen($tr[$key]) > $params['maxlength'])
$echo = '<span title="'.$tr[$key].'">'.Tools::substr($tr[$key], 0, $params['maxlength']).'...</span>';
else
$echo = $tr[$key];
if (isset($params['callback'])) if (isset($params['callback']))
{ {
$callback_obj = (isset($params['callback_object'])) ? $params['callback_object'] : $this->context->controller; $callback_obj = (isset($params['callback_object'])) ? $params['callback_object'] : $this->context->controller;
controllers/admin/AdminCustomerThreadsController.php
+1 -1
View File
@@ -111,7 +111,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
'width' => 50, 'width' => 50,
'filter_key' => 'messages', 'filter_key' => 'messages',
'tmpTableFilter' => true, 'tmpTableFilter' => true,
'maxlength' => 0 'maxlength' => 40
), ),
'date_upd' => array( 'date_upd' => array(
'title' => $this->l('Last message'), 'title' => $this->l('Last message'),