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

// Tree bugs

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-12 15:22:47 +02:00
parent bc221b993b
commit c105486fa3
5 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/categories/helpers/tree/tree_node_folder_checkbox.tpl → admin-dev/themes/default/template/helpers/tree/tree_node_folder_checkbox_shops.tpl
View File
admin-dev/themes/default/template/controllers/categories/helpers/tree/tree_node_item_checkbox.tpl → admin-dev/themes/default/template/helpers/tree/tree_node_item_checkbox_shops.tpl
View File
classes/helper/HelperForm.php
+2 -3
View File
@@ -139,7 +139,7 @@ class HelperFormCore extends Helper
case 'shop' : case 'shop' :
$disable_shops = isset($params['disable_shared']) ? $params['disable_shared'] : false; $disable_shops = isset($params['disable_shared']) ? $params['disable_shared'] : false;
$params['html'] = $this->renderAssoShop($params['tree'], $disable_shops); $params['html'] = $this->renderAssoShop($disable_shops);
if (Shop::getTotalShops(false) == 1) if (Shop::getTotalShops(false) == 1)
unset($this->fields_form[$fieldset_key]['form']['input'][$key]); unset($this->fields_form[$fieldset_key]['form']['input'][$key]);
break; break;
@@ -234,8 +234,7 @@ class HelperFormCore extends Helper
$nb_shop += count($value['shops']); $nb_shop += count($value['shops']);
}*/ }*/
$tree = new HelperTreeShops($params['id'], $tree = new HelperTreeShops('shop-tree', 'Shops');
isset($params['title']) ? $params['title'] : null);
$tree->setSelectedShops($assos); $tree->setSelectedShops($assos);
return $tree->render(); return $tree->render();
} }
classes/helper/HelperTreeShops.php
+2 -2
View File
@@ -27,8 +27,8 @@
class HelperTreeShopsCore extends TreeCore class HelperTreeShopsCore extends TreeCore
{ {
const DEFAULT_TEMPLATE = 'tree_shops.tpl'; const DEFAULT_TEMPLATE = 'tree_shops.tpl';
const DEFAULT_NODE_FOLDER_TEMPLATE = 'tree_node_folder_checkbox.tpl'; const DEFAULT_NODE_FOLDER_TEMPLATE = 'tree_node_folder_checkbox_shops.tpl';
const DEFAULT_NODE_ITEM_TEMPLATE = 'tree_node_item_checkbox.tpl'; const DEFAULT_NODE_ITEM_TEMPLATE = 'tree_node_item_checkbox_shops.tpl';
private $_lang; private $_lang;
private $_selected_shops; private $_selected_shops;
controllers/admin/AdminCategoriesController.php
-4
View File
@@ -484,10 +484,6 @@ class AdminCategoriesControllerCore extends AdminController
if (Shop::isFeatureActive()) if (Shop::isFeatureActive())
$this->fields_form['input'][] = array( $this->fields_form['input'][] = array(
'type' => 'shop', 'type' => 'shop',
'tree' => array(
'id' => 'shops-tree',
'title' => 'Shop'
),
'label' => $this->l('Shop association:'), 'label' => $this->l('Shop association:'),
'name' => 'checkBoxShopAsso', 'name' => 'checkBoxShopAsso',
); );