gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug_10022' into 3.14-master

This commit is contained in:
Jared Camins-Esakov 2013-05-01 06:44:26 -04:00
parent d1db0064a2 86511b380f
commit 9aa2e6fd75
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
View File

@ -239,8 +239,8 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
</table>
[% END %]
[% IF ( tagloop ) %]<fieldset class="action">
<input type="submit" value="Approve" id="approve_button" name="op" />
<input type="submit" value="Reject" id="reject_button" name="op" />
<input type="submit" value="Approve" id="approve_button" name="op-approve" />
<input type="submit" value="Reject" id="reject_button" name="op-reject" />
</fieldset>[% END %]
</form>
</div>
@ -268,7 +268,7 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
<div class="description">Enter a word or phrase to check against approved/rejected lists: </div>
<form method="post" action="/cgi-bin/koha/tags/review.pl">
<input type="text" size="14" name="test" id="test" />
<fieldset class="action"><input type="submit" value="Test" id="test_button" name="op" /></fieldset>
<fieldset class="action"><input type="submit" value="Test" id="test_button" name="op-test" /></fieldset>
<div id="verdict">
[% IF ( test_term ) %]
[% IF ( verdict_ok ) %]

7
tags/review.pl
View File

@ -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};