diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl index 528f1043c..c5517db46 100644 --- a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl @@ -31,7 +31,7 @@ {/if} {if $input.type == 'text_customer' && !isset($customer)} - + {else} {$smarty.block.parent} {/if} @@ -85,9 +85,8 @@ }); -
- - * +
+
{/if} {else} diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl index 46c1f69e7..24d51bd57 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl @@ -179,18 +179,25 @@ diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/tree/index.php b/admin-dev/themes/default/template/controllers/groups/helpers/tree/index.php new file mode 100644 index 000000000..30839633c --- /dev/null +++ b/admin-dev/themes/default/template/controllers/groups/helpers/tree/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../../../../../'); +exit; \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl new file mode 100644 index 000000000..3fcf0e26b --- /dev/null +++ b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_folder_radio.tpl @@ -0,0 +1,34 @@ +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
  • + + + + + +
      + {$children} +
    +
    • \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl new file mode 100644 index 000000000..3eae8edf4 --- /dev/null +++ b/admin-dev/themes/default/template/controllers/groups/helpers/tree/tree_node_item_radio.tpl @@ -0,0 +1,31 @@ +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
  • + +
    • \ No newline at end of file diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php index 2ff739af9..bfd507726 100644 --- a/controllers/admin/AdminGroupsController.php +++ b/controllers/admin/AdminGroupsController.php @@ -312,8 +312,8 @@ class AdminGroupsControllerCore extends AdminController $this->fields_value['reduction'] = isset($group->reduction) ? $group->reduction : 0; - $helper = new Helper(); - $this->tpl_form_vars['categoryTreeView'] = $helper->renderCategoryTree(null, array(), 'id_category', true, false, array(), true, true); + $tree = new HelperTreeCategories('categories-tree'); + $this->tpl_form_vars['categoryTreeView'] = $tree->render(); return parent::renderForm(); }