Index: trunk/core/admin_templates/catalog/catalog.tpl =================================================================== diff -u -N -r5026 -r5027 --- trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5026) +++ trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5027) @@ -1,6 +1,6 @@ - + @@ -22,12 +22,12 @@ var a_toolbar = new ToolBar(); a_toolbar.AddButton( new ToolBarButton('upcat', '', function() { - $Catalog.submit_event('c', 'OnCategoryUp', null, 'categories_div', 'categories_form'); + $Catalog.submit_event('c', 'OnCategoryUp'); } ) ); a_toolbar.AddButton( new ToolBarButton('homecat', '', function() { - $Catalog.submit_event('c', 'OnGoHome', null, 'categories_div', 'categories_form'); + $Catalog.submit_event('c', 'OnGoHome'); } ) ); @@ -49,63 +49,63 @@ a_toolbar.AddButton( new ToolBarButton('delete', '', function() { - std_delete_items('c') + std_delete_items($Catalog.getCurrentPrefix()); } ) ); a_toolbar.AddButton( new ToolBarSeparator('sep2') ); a_toolbar.AddButton( new ToolBarButton('approve', '', function() { - $Catalog.submit_event('c','OnMassApprove', null, 'categories_div', 'categories_form'); + $Catalog.submit_event(null, 'OnMassApprove'); } ) ); a_toolbar.AddButton( new ToolBarButton('decline', '', function() { - $Catalog.submit_event('c','OnMassDecline', null, 'categories_div', 'categories_form'); + $Catalog.submit_event(null, 'OnMassDecline'); } ) ); a_toolbar.AddButton( new ToolBarSeparator('sep3') ); a_toolbar.AddButton( new ToolBarButton('export', '', function() { - + $Catalog.submit_event(this.ActivePrefix, 'OnExport'); } ) ); a_toolbar.AddButton( new ToolBarButton('rebuild_cache', '', function() { - + $Catalog.submit_event(null, 'OnRebuildCache'); } ) ); a_toolbar.AddButton( new ToolBarSeparator('sep4') ); a_toolbar.AddButton( new ToolBarButton('cut', '', function() { - + $Catalog.submit_event(null, 'OnCut'); } ) ); a_toolbar.AddButton( new ToolBarButton('copy', '', function() { - + $Catalog.submit_event(null, 'OnCopy'); } ) ); a_toolbar.AddButton( new ToolBarButton('paste', '', function() { - + $Catalog.submit_event(null, 'OnCatPaste'); } ) ); a_toolbar.AddButton( new ToolBarSeparator('sep5') ); a_toolbar.AddButton( new ToolBarButton('move_up', '', function() { - + $Catalog.submit_event(null, 'OnMassMoveUp'); } ) ); a_toolbar.AddButton( new ToolBarButton('move_down', '', function() { - + $Catalog.submit_event(null, 'OnMassMoveDown'); } ) ); @@ -120,8 +120,9 @@ function edit() { - $form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form'; - std_edit_item($Catalog.ActivePrefix, $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'edit_template')); + var $current_prefix = $Catalog.getCurrentPrefix(); + $form_name = $Catalog.queryTabRegistry('prefix', $current_prefix, 'tab_id') + '_form'; + std_edit_item($current_prefix, $Catalog.queryTabRegistry('prefix', $current_prefix, 'edit_template')); } @@ -207,8 +208,4 @@ --> - - - \ No newline at end of file + \ No newline at end of file