Index: branches/RC/core/admin_templates/js/catalog.js
===================================================================
diff -u -N -r9525 -r9906
--- branches/RC/core/admin_templates/js/catalog.js (.../catalog.js) (revision 9525)
+++ branches/RC/core/admin_templates/js/catalog.js (.../catalog.js) (revision 9906)
@@ -334,4 +334,16 @@
Catalog.prototype.reflectPasteButton = function($status) {
a_toolbar.SetEnabled('paste', $status);
a_toolbar.SetEnabled('clear_clipboard', $status);
+}
+
+Catalog.prototype.storeIDs = function ($category_variable) {
+ set_hidden_field($category_variable, Grids['c'].GetSelected().join(','));
+
+ // get selectes category items
+ for (var $i in Grids[this.ActivePrefix].Items) {
+ if (Grids[this.ActivePrefix].Items[$i].selected) {
+ set_hidden_field(Grids[this.ActivePrefix].Items[$i].CheckBox.id, 'on', false);
+ }
+ }
+
}
\ No newline at end of file
Index: branches/RC/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r9794 -r9906
--- branches/RC/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 9794)
+++ branches/RC/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 9906)
@@ -72,6 +72,8 @@
} ) );
+
+
a_toolbar.AddButton( new ToolBarSeparator('sep2') );
a_toolbar.AddButton( new ToolBarButton('approve', '', function() {
@@ -89,16 +91,7 @@
a_toolbar.AddButton( new ToolBarButton('in-portal:export', '', function() {
var $export_prefixes = new Array('l', 'p');
if (in_array($Catalog.ActivePrefix, $export_prefixes)) {
- // get selected categories
- set_hidden_field('export_categories', Grids['c'].GetSelected().join(','));
-
- // get selectes category items
- for (var $i in Grids[$Catalog.ActivePrefix].Items) {
- if (Grids[$Catalog.ActivePrefix].Items[$i].selected) {
- set_hidden_field(Grids[$Catalog.ActivePrefix].Items[$i].CheckBox.id, 'on', false);
- }
- }
-
+ $Catalog.storeIDs('export_categories');
submit_event($Catalog.ActivePrefix, 'OnExport');
}
else {
Index: branches/RC/kernel/admin_templates/incs/catalog.js
===================================================================
diff -u -N -r9525 -r9906
--- branches/RC/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 9525)
+++ branches/RC/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 9906)
@@ -334,4 +334,16 @@
Catalog.prototype.reflectPasteButton = function($status) {
a_toolbar.SetEnabled('paste', $status);
a_toolbar.SetEnabled('clear_clipboard', $status);
+}
+
+Catalog.prototype.storeIDs = function ($category_variable) {
+ set_hidden_field($category_variable, Grids['c'].GetSelected().join(','));
+
+ // get selectes category items
+ for (var $i in Grids[this.ActivePrefix].Items) {
+ if (Grids[this.ActivePrefix].Items[$i].selected) {
+ set_hidden_field(Grids[this.ActivePrefix].Items[$i].CheckBox.id, 'on', false);
+ }
+ }
+
}
\ No newline at end of file
Index: branches/RC/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -N -r9794 -r9906
--- branches/RC/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 9794)
+++ branches/RC/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 9906)
@@ -72,6 +72,8 @@
} ) );
+
+
a_toolbar.AddButton( new ToolBarSeparator('sep2') );
a_toolbar.AddButton( new ToolBarButton('approve', '', function() {
@@ -89,16 +91,7 @@
a_toolbar.AddButton( new ToolBarButton('in-portal:export', '', function() {
var $export_prefixes = new Array('l', 'p');
if (in_array($Catalog.ActivePrefix, $export_prefixes)) {
- // get selected categories
- set_hidden_field('export_categories', Grids['c'].GetSelected().join(','));
-
- // get selectes category items
- for (var $i in Grids[$Catalog.ActivePrefix].Items) {
- if (Grids[$Catalog.ActivePrefix].Items[$i].selected) {
- set_hidden_field(Grids[$Catalog.ActivePrefix].Items[$i].CheckBox.id, 'on', false);
- }
- }
-
+ $Catalog.storeIDs('export_categories');
submit_event($Catalog.ActivePrefix, 'OnExport');
}
else {