MT#15685 suppress output for correct backuritmp

by default, query_param_delete returns a value, which is printed by
Template Toolkit.

Change-Id: Ib6bd0e34fc16e765f957898763cb00ab029721fe
changes/74/3274/7
Gerhard Jungwirth 10 years ago
parent b9a6ecdf4b
commit 9a1d6d3240

@ -158,9 +158,9 @@ var mainWrapperInit = function () {
-%]
$('a').each(function() {
var _text = $(this).text().trim();
var href = $(this).attr('href');
var _href = $(this).attr('href');
var javascriptLink = 0;
if(href && ( href.search(/^javascript:/i) > -1 ) ){
if(_href && ( _href.search(/^javascript:/i) > -1 ) ){
javascriptLink = 1;
}
if(_text == "Back" ||
@ -173,7 +173,6 @@ var mainWrapperInit = function () {
return true;
}
var _href = $(this).attr('href');
var backuri = $(this).data('backuri') ? $(this).data('backuri') : '[%- backuri | uri -%]';
var _back = 'back='+backuri;
if(_href == null || _href.match(/[&\?]back=/)) {

@ -51,7 +51,14 @@
<td class="ngcp-actions-column">
[% UNLESS c.user.read_only -%]
<div class="sw_actions pull-right">
<a class="btn btn-small btn-primary" data-backuri="[%-backuritmp=c.req.uri;backuritmp.query_param_delete('back');backuritmp.query_param_delete('move');backuritmp.query_param_delete('where');backuritmp-%]" href="[% c.uri_for_action('/rewrite/rules_edit',[set_result.id, r.id]) %]">
[%- FILTER null;
backuritmp=c.req.uri;
backuritmp.query_param_delete('back');
backuritmp.query_param_delete('move');
backuritmp.query_param_delete('where');
END;
%]
<a class="btn btn-small btn-primary" data-backuri="[%-backuritmp-%]" href="[% c.uri_for_action('/rewrite/rules_edit',[set_result.id, r.id]) %]">
<i class="icon-edit"></i> [% c.loc('Edit') %]
</a>
<a data-confirm="Delete" class="btn btn-small btn-secondary" href="[% c.uri_for_action('/rewrite/rules_delete',[set_result.id, r.id]) %]">

Loading…
Cancel
Save