@@ -, +, @@ - Making the atomic updates executable - Preventing warns when running tests - Updating db updates - Fixing terminology - Make 'cancel selected recalls' button yellow - Fix HTML makeup of recalls request page - Show a warning when placing a recall if there is already a - Show a link to mark a hold for conversion which selects the recall --- ...D_CANCELLATION-RECALLED_authorised_value.pl | 4 +++- ...bug_31391_-_add_RecallsInterface_syspref.pl | 4 +++- .../prog/en/includes/holds_table.inc | 6 ++++++ .../modules/admin/preferences/circulation.pref | 18 +++++++++--------- .../prog/en/modules/recalls/request.tt | 18 ++++++++++++++---- .../prog/en/modules/reserve/request.tt | 4 ++++ recalls/request.pl | 2 ++ t/db_dependent/Holds.t | 12 ++++++++++++ 8 files changed, 53 insertions(+), 15 deletions(-) mode change 100644 => 100755 installer/data/mysql/atomicupdate/bug_31391_-_add_HOLD_CANCELLATION-RECALLED_authorised_value.pl mode change 100644 => 100755 installer/data/mysql/atomicupdate/bug_31391_-_add_RecallsInterface_syspref.pl --- a/installer/data/mysql/atomicupdate/bug_31391_-_add_HOLD_CANCELLATION-RECALLED_authorised_value.pl +++ a/installer/data/mysql/atomicupdate/bug_31391_-_add_HOLD_CANCELLATION-RECALLED_authorised_value.pl @@ -2,11 +2,13 @@ use Modern::Perl; return { bug_number => "31391", - description => "Add new RECALLED value to HOLD_CANCELLATION authorised value category", + description => "Staff-side recalls", up => sub { my ($args) = @_; my ($dbh, $out) = @$args{qw(dbh out)}; $dbh->do(q{ INSERT IGNORE INTO authorised_values (category, authorised_value, lib) VALUES ('HOLD_CANCELLATION','RECALLED','Hold was converted to a recall') }); + + say $out "Added RECALLED value to HOLD_CANCELLATION authorised value category"; }, }; --- a/installer/data/mysql/atomicupdate/bug_31391_-_add_RecallsInterface_syspref.pl +++ a/installer/data/mysql/atomicupdate/bug_31391_-_add_RecallsInterface_syspref.pl @@ -2,11 +2,13 @@ use Modern::Perl; return { bug_number => "31391", - description => "Add new system preference RecallsInterface", + description => "Staff-side recalls", up => sub { my ($args) = @_; my ($dbh, $out) = @$args{qw(dbh out)}; $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('RecallsInterface','opac','opac|staff|both','The interface that recalls can be placed through','Choice') }); + + say $out "Added system preference 'RecallsInterface'"; }, }; --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -23,6 +23,7 @@