@@ -, +, @@ - shows new due date on opac-recall.pl when the recall is requested - shows new due date on opac-recalls.pl recalls history - shows new due date on circ/recalls_queue.pl - syspref is default off - recalls tab on catalogue/detail.pl - show that there is a recall on an item on catalogue/detail.pl --- catalogue/detail.pl | 10 ++++++++++ .../atomicupdate/bug_19532_-_add_Recalls_syspref.sql | 2 +- installer/data/mysql/sysprefs.sql | 2 +- .../intranet-tmpl/prog/en/includes/recalls-reports.inc | 18 ++++++++++++++++++ .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 16 ++++++++++++++-- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-recall.tt | 3 ++- .../opac-tmpl/bootstrap/en/modules/opac-recalls.tt | 13 ++++++++++++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +- opac/opac-recall.pl | 3 ++- 10 files changed, 62 insertions(+), 9 deletions(-) --- a/catalogue/detail.pl +++ a/catalogue/detail.pl @@ -46,6 +46,7 @@ use Koha::Items; use Koha::ItemTypes; use Koha::Patrons; use Koha::Virtualshelves; +use Koha::Recalls; my $query = CGI->new(); @@ -319,6 +320,12 @@ foreach my $item (@items) { } } + my $recall = Koha::Recalls->find({ itemnumber => $item->{itemnumber} }); + if (defined $recall){ + $item->{recalled} = 1; + $item->{recall} = $recall; + } + if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET" and C4::Context->preference('SeparateHoldings')) { if ($itembranchcode and $itembranchcode eq $currentbranch) { @@ -396,6 +403,8 @@ foreach ( keys %{$dat} ) { $template->param( "$_" => defined $dat->{$_} ? $dat->{$_} : '' ); } +my $recalls = Koha::Recalls->search({ biblionumber => $biblionumber }); + # does not work: my %views_enabled = map { $_ => 1 } $template->query(loop => 'EnableViews'); # method query not found?!?! $template->param( AmazonTld => get_amazon_tld() ) if ( C4::Context->preference("AmazonCoverImages")); @@ -405,6 +414,7 @@ $template->param( biblionumber => $biblionumber, ($analyze? 'analyze':'detailview') =>1, subscriptions => \@subs, + recalls => $recalls, subscriptionsnumber => $subscriptionsnumber, subscriptiontitle => $dat->{title}, searchid => scalar $query->param('searchid'), --- a/installer/data/mysql/atomicupdate/bug_19532_-_add_Recalls_syspref.sql +++ a/installer/data/mysql/atomicupdate/bug_19532_-_add_Recalls_syspref.sql @@ -1, +1, @@ -INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('UseRecalls','1',NULL,'Enable or disable recalls','YesNo'); +INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('UseRecalls','0',NULL,'Enable or disable recalls','YesNo'); --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -588,7 +588,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('UseICU','0','1','Tell Koha if ICU indexing is in use for Zebra or not.','YesNo'), ('UseKohaPlugins','0','','Enable or disable the ability to use Koha Plugins.','YesNo'), ('UseQueryParser','0',NULL,'If enabled, try to use QueryParser for queries.','YesNo'), -('UseRecalls', '1', NULL, 'Enable or disable recalls', 'YesNo'), +('UseRecalls', '0', NULL, 'Enable or disable recalls', 'YesNo'), ('UseTransportCostMatrix','0','','Use Transport Cost Matrix when filling holds','YesNo'), ('UseWYSIWYGinSystemPreferences','0','','Show WYSIWYG editor when editing certain HTML system preferences.','YesNo'), ('viewISBD','1','','Allow display of ISBD view of bibiographic records','YesNo'), --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc @@ -6,10 +6,12 @@