From 20b016beab69c9678133001fe7595d81704c7ce0 Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Wed, 10 Apr 2013 12:37:54 +0200 Subject: [PATCH] Bug 10022 - Multiple tags moderation doesn't work on translated page When using a translated intranet, tags moderation using checkboxes and a submit button doesn't work. You get a message "Unknown Operation on x Term(s)" (translated of course). This patch corrects by using name="op-[operation]" instead of name="op" in each submit input. Test plan : - Create a new tag on a record - Go to tags moderation in Tools => You should see your tag in pending terms - Click on checkbox - Click on Approve or Reject submit button at the bottom of the table => Without patch the tag is still pending => With patch operation is well performed, tag is not pending - Test "Check lists" form - Test Approve and Reject buttons from "Actions" column Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov (cherry picked from commit 86511b380f06f4b0f9c6a21332819c9614ac3b59) Signed-off-by: Jared Camins-Esakov --- koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt | 6 +++--- tags/review.pl | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt index e1dc69847f..a3b1e224b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -239,8 +239,8 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% END %] [% IF ( tagloop ) %]
- - + +
[% END %] @@ -268,7 +268,7 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
Enter a word or phrase to check against approved/rejected lists:
-
+
[% IF ( test_term ) %] [% IF ( verdict_ok ) %] diff --git a/tags/review.pl b/tags/review.pl index 3b7a0a0b43..1affd539e7 100755 --- a/tags/review.pl +++ b/tags/review.pl @@ -89,7 +89,12 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({ }); my ($op, @errors, @tags); -$op = lc($input->param('op')) || 'none'; + +foreach (qw( approve reject test )) { + $op = $_ if ( $input->param("op-$_") ); +} +$op ||= 'none'; + @tags = $input->param('tags'); $borrowernumber == 0 and push @errors, {op_zero=>1}; -- 2.39.5