Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/advanced_view.tpl =================================================================== diff -u -r5735 -r5741 --- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/advanced_view.tpl (.../advanced_view.tpl) (revision 5735) +++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/advanced_view.tpl (.../advanced_view.tpl) (revision 5741) @@ -31,20 +31,26 @@ a_toolbar.AddButton( new ToolBarButton('delete', '', function() { - var $template = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'view_template'); - std_delete_items($Catalog.getCurrentPrefix(), $template, 1); + var $template = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'view_template'); + $form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form'; + set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + '.showall]', 1); + std_delete_items($Catalog.ActivePrefix, $template, 1); } ) ); a_toolbar.AddButton( new ToolBarSeparator('sep2') ); a_toolbar.AddButton( new ToolBarButton('approve', '', function() { - $Catalog.submit_event(null, 'OnMassApprove'); + $form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form'; + set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + '.showall]', 1); + $Catalog.submit_event($Catalog.ActivePrefix, 'OnMassApprove'); } ) ); a_toolbar.AddButton( new ToolBarButton('decline', '', function() { - $Catalog.submit_event(null, 'OnMassDecline'); + $form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form'; + set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + '.showall]', 1); + $Catalog.submit_event($Catalog.ActivePrefix, 'OnMassDecline'); } ) ); Index: branches/unlabeled/unlabeled-1.36.2/kernel/admin_templates/incs/grid_blocks.tpl =================================================================== diff -u -r5630 -r5741 --- branches/unlabeled/unlabeled-1.36.2/kernel/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 5630) +++ branches/unlabeled/unlabeled-1.36.2/kernel/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 5741) @@ -373,7 +373,7 @@ - +
Index: branches/unlabeled/unlabeled-1.14.2/core/kernel/parser/template.php =================================================================== diff -u -r5726 -r5741 --- branches/unlabeled/unlabeled-1.14.2/core/kernel/parser/template.php (.../template.php) (revision 5726) +++ branches/unlabeled/unlabeled-1.14.2/core/kernel/parser/template.php (.../template.php) (revision 5741) @@ -53,6 +53,10 @@ } else { if ($silent != 2) { + $application =& kApplication::Instance(); + if ($application->isDebugMode()) { + $application->Debugger->appendTrace(); + } trigger_error("File or block not found: $filename", ($silent ? E_USER_NOTICE : E_USER_ERROR) ); } return false; Index: branches/unlabeled/unlabeled-1.27.2/core/admin_templates/js/catalog.js =================================================================== diff -u -r5716 -r5741 --- branches/unlabeled/unlabeled-1.27.2/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5716) +++ branches/unlabeled/unlabeled-1.27.2/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5741) @@ -248,9 +248,7 @@ Catalog.prototype.queryTabRegistry = function($search_key, $search_value, $return_key) { if ($search_key == 'prefix' && $search_value != null) { // remove special here (lists with specials, but tabs have no special) - if ($search_value.indexOf('.') != -1) { - $search_value = $search_value.substring(0, $search_value.indexOf('.')); - } + $search_value = this.cutSpecial($search_value); } var $i = 0; @@ -282,8 +280,16 @@ } } +Catalog.prototype.cutSpecial = function($prefix_special) { + var $prefix = $prefix_special; + if ($prefix.indexOf('.') != -1) { + $prefix = $prefix.substring(0, $prefix.indexOf('.')); + } + return $prefix; +} + Catalog.prototype.setItemCount = function($prefix, $count) { - setInnerHTML($prefix + '_item_count', $count); + setInnerHTML(this.cutSpecial($prefix) + '_item_count', $count); } Catalog.prototype.getCurrentPrefix = function() { Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/advanced_view.tpl =================================================================== diff -u -r5735 -r5741 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/advanced_view.tpl (.../advanced_view.tpl) (revision 5735) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog/advanced_view.tpl (.../advanced_view.tpl) (revision 5741) @@ -31,20 +31,26 @@ a_toolbar.AddButton( new ToolBarButton('delete', '', function() { - var $template = $Catalog.queryTabRegistry('prefix', $Catalog.getCurrentPrefix(), 'view_template'); - std_delete_items($Catalog.getCurrentPrefix(), $template, 1); + var $template = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'view_template'); + $form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form'; + set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + '.showall]', 1); + std_delete_items($Catalog.ActivePrefix, $template, 1); } ) ); a_toolbar.AddButton( new ToolBarSeparator('sep2') ); a_toolbar.AddButton( new ToolBarButton('approve', '', function() { - $Catalog.submit_event(null, 'OnMassApprove'); + $form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form'; + set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + '.showall]', 1); + $Catalog.submit_event($Catalog.ActivePrefix, 'OnMassApprove'); } ) ); a_toolbar.AddButton( new ToolBarButton('decline', '', function() { - $Catalog.submit_event(null, 'OnMassDecline'); + $form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form'; + set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + '.showall]', 1); + $Catalog.submit_event($Catalog.ActivePrefix, 'OnMassDecline'); } ) ); Index: branches/unlabeled/unlabeled-1.11.2/core/kernel/processors/tag_processor.php =================================================================== diff -u -r5653 -r5741 --- branches/unlabeled/unlabeled-1.11.2/core/kernel/processors/tag_processor.php (.../tag_processor.php) (revision 5653) +++ branches/unlabeled/unlabeled-1.11.2/core/kernel/processors/tag_processor.php (.../tag_processor.php) (revision 5741) @@ -50,6 +50,13 @@ } //echo htmlspecialchars($tag->GetFullTag()).'
'; + + // pass_params for non ParseBlock tags :) + if (isset($params['pass_params']) && $params['pass_params']) { + $params = array_merge_recursive2($this->Application->Parser->Params, $params); + unset($params['pass_params']); + } + $ret = $this->$Method($params); if (isset($params['js_escape']) && $params['js_escape']) { $ret = str_replace('\'', ''', $ret); Index: branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/incs/catalog.js =================================================================== diff -u -r5716 -r5741 --- branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5716) +++ branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5741) @@ -248,9 +248,7 @@ Catalog.prototype.queryTabRegistry = function($search_key, $search_value, $return_key) { if ($search_key == 'prefix' && $search_value != null) { // remove special here (lists with specials, but tabs have no special) - if ($search_value.indexOf('.') != -1) { - $search_value = $search_value.substring(0, $search_value.indexOf('.')); - } + $search_value = this.cutSpecial($search_value); } var $i = 0; @@ -282,8 +280,16 @@ } } +Catalog.prototype.cutSpecial = function($prefix_special) { + var $prefix = $prefix_special; + if ($prefix.indexOf('.') != -1) { + $prefix = $prefix.substring(0, $prefix.indexOf('.')); + } + return $prefix; +} + Catalog.prototype.setItemCount = function($prefix, $count) { - setInnerHTML($prefix + '_item_count', $count); + setInnerHTML(this.cutSpecial($prefix) + '_item_count', $count); } Catalog.prototype.getCurrentPrefix = function() {