Index: trunk/core/admin_templates/js/catalog.js =================================================================== diff -u -N -r5063 -r5078 --- trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5063) +++ trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5078) @@ -176,6 +176,7 @@ this.TabRegistry[$index]['tab_id'] = $tab_id; this.TabRegistry[$index]['prefix'] = $tab.getAttribute('prefix'); this.TabRegistry[$index]['module_path'] = $tab.getAttribute('edit_template').substring(0, $tab.getAttribute('edit_template').indexOf('/')); + this.TabRegistry[$index]['view_template'] = $tab.getAttribute('view_template'); this.TabRegistry[$index]['edit_template'] = $tab.getAttribute('edit_template'); this.TabRegistry[$index]['dep_buttons'] = $tab.getAttribute('dep_buttons').split(','); this.TabRegistry[$index]['index'] = $index; Index: trunk/core/admin_templates/catalog/catalog.tpl =================================================================== diff -u -N -r5073 -r5078 --- trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5073) +++ trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5078) @@ -53,8 +53,8 @@ a_toolbar.AddButton( new ToolBarButton('delete', '', function() { - var $module_path = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'module_path'); - std_delete_items($Catalog.getCurrentPrefix(), $module_path + '/catalog_tab', 1); + var $template = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'view_template'); + std_delete_items($Catalog.getCurrentPrefix(), $template, 1); } ) ); @@ -172,7 +172,7 @@ -
+
Index: trunk/kernel/admin_templates/incs/catalog.js =================================================================== diff -u -N -r5063 -r5078 --- trunk/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5063) +++ trunk/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5078) @@ -176,6 +176,7 @@ this.TabRegistry[$index]['tab_id'] = $tab_id; this.TabRegistry[$index]['prefix'] = $tab.getAttribute('prefix'); this.TabRegistry[$index]['module_path'] = $tab.getAttribute('edit_template').substring(0, $tab.getAttribute('edit_template').indexOf('/')); + this.TabRegistry[$index]['view_template'] = $tab.getAttribute('view_template'); this.TabRegistry[$index]['edit_template'] = $tab.getAttribute('edit_template'); this.TabRegistry[$index]['dep_buttons'] = $tab.getAttribute('dep_buttons').split(','); this.TabRegistry[$index]['index'] = $index; Index: trunk/kernel/admin_templates/catalog.tpl =================================================================== diff -u -N -r5073 -r5078 --- trunk/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5073) +++ trunk/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5078) @@ -53,8 +53,8 @@ a_toolbar.AddButton( new ToolBarButton('delete', '', function() { - var $module_path = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'module_path'); - std_delete_items($Catalog.getCurrentPrefix(), $module_path + '/catalog_tab', 1); + var $template = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'view_template'); + std_delete_items($Catalog.getCurrentPrefix(), $template, 1); } ) ); @@ -172,7 +172,7 @@ -
+
Index: trunk/kernel/admin_templates/xml/categories_list.tpl =================================================================== diff -u -N -r5074 -r5078 --- trunk/kernel/admin_templates/xml/categories_list.tpl (.../categories_list.tpl) (revision 5074) +++ trunk/kernel/admin_templates/xml/categories_list.tpl (.../categories_list.tpl) (revision 5078) @@ -8,7 +8,7 @@ -document.getElementById('categories_form').action = ''; +document.getElementById('categories_form').action = ''; $Catalog.setItemCount('c', ''); $Catalog.ParentCategoryID = ; document.getElementById('c_search_warning').style.display = 'blocknone'; Index: trunk/core/admin_templates/categories/xml/categories_list.tpl =================================================================== diff -u -N -r5074 -r5078 --- trunk/core/admin_templates/categories/xml/categories_list.tpl (.../categories_list.tpl) (revision 5074) +++ trunk/core/admin_templates/categories/xml/categories_list.tpl (.../categories_list.tpl) (revision 5078) @@ -8,7 +8,7 @@ -document.getElementById('categories_form').action = ''; +document.getElementById('categories_form').action = ''; $Catalog.setItemCount('c', ''); $Catalog.ParentCategoryID = ; document.getElementById('c_search_warning').style.display = 'blocknone';