Index: trunk/core/admin_templates/js/catalog.js =================================================================== diff -u -N -r5047 -r5048 --- trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5047) +++ trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5048) @@ -51,6 +51,8 @@ this.BusyRequest[$prefix] = false; Request.makeRequest($kf.action, this.BusyRequest[$prefix], $tab_id + '_div', this.successCallback, this.errorCallback, $tab_id + '_div'); + + $form_name = 'kernel_form'; // restore back to main form with current category id of catalog }; Catalog.prototype.successCallback = function($request, $params) { Index: trunk/core/admin_templates/catalog/catalog.tpl =================================================================== diff -u -N -r5041 -r5048 --- trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5041) +++ trunk/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5048) @@ -168,7 +168,7 @@ -
+
Index: trunk/kernel/admin_templates/incs/script.js =================================================================== diff -u -N -r5044 -r5048 --- trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 5044) +++ trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 5048) @@ -69,10 +69,11 @@ setArrayValue($hooks, $function_name, $hook_type, $hook_body); } -function resort_grid(prefix_special, field, $ajax) +function resort_grid($prefix_special, $field, $ajax) { - set_hidden_field(prefix_special + '_Sort1', field); - submit_event(prefix_special, 'OnSetSorting', null, null, $ajax); + set_form($prefix_special, $ajax); + set_hidden_field($prefix_special + '_Sort1', $field); + submit_event($prefix_special, 'OnSetSorting', null, null, $ajax); } function direct_sort_grid($prefix_special,$field,$direction,$field_pos) @@ -197,10 +198,11 @@ alert(s); } -function go_to_page(prefix_special, page, $ajax) +function go_to_page($prefix_special, $page, $ajax) { - set_hidden_field(prefix_special+'_Page', page); - submit_event(prefix_special, null, null, null, $ajax); + set_form($prefix_special, $ajax); + set_hidden_field($prefix_special + '_Page', $page); + submit_event($prefix_special, null, null, null, $ajax); } function go_to_list(prefix_special, tab) @@ -435,6 +437,14 @@ submit_event(prefix_special,'OnMassDelete') } + +// set current form base on ajax +function set_form($prefix_special, $ajax) +{ + if (!$ajax) return ; + $form_name = $Catalog.queryTabRegistry('prefix', $prefix_special, 'tab_id') + '_form'; +} + // sets hidden field value // if the field does not exist - creates it function set_hidden_field($field_id, $value) @@ -473,12 +483,14 @@ function search($prefix_special, $grid_name, $ajax) { + set_form($prefix_special, $ajax); set_hidden_field('grid_name', $grid_name); submit_event($prefix_special, 'OnSearch', null, null, $ajax); } function search_reset($prefix_special, $grid_name, $ajax) { + set_form($prefix_special, $ajax); set_hidden_field('grid_name', $grid_name); submit_event($prefix_special, 'OnSearchReset', null, null, $ajax); } Index: trunk/kernel/admin_templates/incs/catalog.js =================================================================== diff -u -N -r5047 -r5048 --- trunk/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5047) +++ trunk/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5048) @@ -51,6 +51,8 @@ this.BusyRequest[$prefix] = false; Request.makeRequest($kf.action, this.BusyRequest[$prefix], $tab_id + '_div', this.successCallback, this.errorCallback, $tab_id + '_div'); + + $form_name = 'kernel_form'; // restore back to main form with current category id of catalog }; Catalog.prototype.successCallback = function($request, $params) { Index: trunk/kernel/admin_templates/catalog.tpl =================================================================== diff -u -N -r5041 -r5048 --- trunk/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5041) +++ trunk/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5048) @@ -168,7 +168,7 @@ -
+