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

Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Francois Gaillard
2013-01-16 18:47:39 +01:00
parent 9390dd63af 6d46644cc4
commit 1060bb3141
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AddressFormat.php
-1
View File
@@ -61,7 +61,6 @@ class AddressFormatCore extends ObjectModel
public static $forbiddenPropertyList = array( public static $forbiddenPropertyList = array(
'deleted', 'deleted',
'date_add', 'date_add',
'other',
'alias', 'alias',
'secure_key', 'secure_key',
'note', 'note',
controllers/admin/AdminCountriesController.php
+1 -1
View File
@@ -442,7 +442,7 @@ class AdminCountriesControllerCore extends AdminController
$html .= '<li> $html .= '<li>
<a href="javascript:void(0);" onClick="displayAvailableFields(\''.$class_name.'\')">'.$class_name.'</a>'; <a href="javascript:void(0);" onClick="displayAvailableFields(\''.$class_name.'\')">'.$class_name.'</a>';
foreach (AddressFormat::getValidateFields($class_name) as $name) foreach (AddressFormat::getValidateFields($class_name) as $name)
$fields[] = '<a style="color:#4B8;" href="javascript:void(0);" class="addPattern" id="'.$class_name.':'.$name.'"> $fields[] = '<a style="color:#4B8;" href="javascript:void(0);" class="addPattern" '.$name.' id="'.($class_name == 'Address' ? $name : $class_name.':'.$name).'">
'.$name.'</a>'; '.$name.'</a>';
$html .= ' $html .= '
<div class="availableFieldsList" id="availableListFieldsFor_'.$class_name.'" style="width:300px;"> <div class="availableFieldsList" id="availableListFieldsFor_'.$class_name.'" style="width:300px;">