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

// Normalization

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12754 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-01-27 13:53:42 +00:00
parent 134c564ae3
commit d1882d8e77
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Configuration.php
+1 -1
View File
@@ -272,7 +272,7 @@ class ConfigurationCore extends ObjectModel
public static function updateValue($key, $values, $html = false, $shopGroupID = null, $shopID = null)
{
if (!Validate::isConfigName($key))
die(Tools::displayError());
die(Tools::displayError());
Configuration::getShopFromContext($shopGroupID, $shopID);
if (!is_array($values))
controllers/admin/AdminCustomersController.php
+14 -14
View File
@@ -33,15 +33,15 @@ class AdminCustomersControllerCore extends AdminController
{
$this->required_database = true;
$this->required_fields = array('newsletter','optin');
$this->table = 'customer';
$this->table = 'customer';
$this->className = 'Customer';
$this->lang = false;
$this->lang = false;
$this->deleted = true;
$this->addRowAction('edit');
$this->addRowAction('view');
$this->addRowAction('delete');
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->context = Context::getContext();
@@ -78,21 +78,21 @@ class AdminCustomersControllerCore extends AdminController
'lastname' => array(
'title' => $this->l('Last Name'),
'width' => 'auto'
),
),
'firstname' => array(
'title' => $this->l('First name'),
'width' => 'auto'
),
),
'email' => array(
'title' => $this->l('E-mail address'),
'width' => 140,
),
),
'age' => array(
'title' => $this->l('Age'),
'width' => 20,
'search' => false,
'align' => 'center'
),
'align' => 'center'
),
'active' => array(
'title' => $this->l('Enabled'),
'width' => 70,
@@ -100,7 +100,7 @@ class AdminCustomersControllerCore extends AdminController
'active' => 'status',
'type' => 'bool',
'orderby' => false
),
),
'newsletter' => array(
'title' => $this->l('News.'),
'width' => 70,
@@ -108,7 +108,7 @@ class AdminCustomersControllerCore extends AdminController
'type' => 'bool',
'callback' => 'printNewsIcon',
'orderby' => false
),
),
'optin' => array(
'title' => $this->l('Opt.'),
'width' => 70,
@@ -116,20 +116,20 @@ class AdminCustomersControllerCore extends AdminController
'type' => 'bool',
'callback' => 'printOptinIcon',
'orderby' => false
),
),
'date_add' => array(
'title' => $this->l('Registration'),
'width' => 150,
'type' => 'date',
'align' => 'right'
),
),
'connect' => array(
'title' => $this->l('Connection'),
'width' => 100,
'type' => 'datetime',
'search' => false
)
);
)
);
$this->shopLinkType = 'shop';
$this->shopShareDatas = Shop::SHARE_CUSTOMER;
controllers/admin/AdminManufacturersController.php
+10 -10
View File
@@ -216,17 +216,17 @@ class AdminManufacturersControllerCore extends AdminController
*/
public function displayEditaddressesLink($token = null, $id)
{
if (!array_key_exists('editaddresses', self::$cache_lang))
self::$cache_lang['editaddresses'] = $this->l('Edit Adresses');
if (!array_key_exists('editaddresses', self::$cache_lang))
self::$cache_lang['editaddresses'] = $this->l('Edit Adresses');
$this->context->smarty->assign(array(
'href' => self::$currentIndex.
'&'.$this->identifier.'='.$id.
'&editaddresses&token='.($token != null ? $token : $this->token),
'action' => self::$cache_lang['editaddresses'],
));
$this->context->smarty->assign(array(
'href' => self::$currentIndex.
'&'.$this->identifier.'='.$id.
'&editaddresses&token='.($token != null ? $token : $this->token),
'action' => self::$cache_lang['editaddresses'],
));
return $this->context->smarty->fetch('helper/list/list_action_edit.tpl');
return $this->context->smarty->fetch('helper/list/list_action_edit.tpl');
}
public function renderForm()
@@ -667,7 +667,7 @@ class AdminManufacturersControllerCore extends AdminController
{
$this->table = 'address';
$this->className = 'Address';
$this->identifier = 'id_address';
$this->identifier = 'id_address';
$this->deleted = true;
}
parent::initProcess();