From c47cae0b1363a62ccaa9c0ee4f61a26a3da4188d Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Thu, 12 Apr 2018 04:04:48 +0000 Subject: [PATCH] Bug 17698: (follow-up) Fixing some small issues Fixing the comments in Comment 42 Ready to test Signed-off-by: Jonathan Druart --- circ/on-site_checkouts.pl | 2 +- ...698_add-permission-to-manage-checkout-notes.sql | 2 +- installer/data/mysql/userpermissions.sql | 2 +- .../prog/en/modules/circ/checkout-notes.tt | 146 +++++++++++---------- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- 5 files changed, 79 insertions(+), 75 deletions(-) diff --git a/circ/on-site_checkouts.pl b/circ/on-site_checkouts.pl index bcf78cc5b5..05eef2c71c 100755 --- a/circ/on-site_checkouts.pl +++ b/circ/on-site_checkouts.pl @@ -45,7 +45,7 @@ my $pending_onsite_checkouts = C4::Circulation::GetPendingOnSiteCheckouts(); $template->param( pending_onsite_checkouts => $pending_onsite_checkouts, - pending_onsite_notes => $pending_onsite_notes, + pending_checkout_notes => $pending_checkout_notes, ); output_html_with_http_headers $cgi, $cookie, $template->output; diff --git a/installer/data/mysql/atomicupdate/bug-17698_add-permission-to-manage-checkout-notes.sql b/installer/data/mysql/atomicupdate/bug-17698_add-permission-to-manage-checkout-notes.sql index 343314bc6f..86d4351d1f 100644 --- a/installer/data/mysql/atomicupdate/bug-17698_add-permission-to-manage-checkout-notes.sql +++ b/installer/data/mysql/atomicupdate/bug-17698_add-permission-to-manage-checkout-notes.sql @@ -1 +1 @@ -INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'manage_checkout_nots', 'Mark checkout notes as seen/not seen'); +INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'manage_checkout_notes', 'Mark checkout notes as seen/not seen'); diff --git a/installer/data/mysql/userpermissions.sql b/installer/data/mysql/userpermissions.sql index 0a0d9f74d3..d12241edc1 100644 --- a/installer/data/mysql/userpermissions.sql +++ b/installer/data/mysql/userpermissions.sql @@ -4,7 +4,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES ( 1, 'overdues_report', 'Execute overdue items report'), ( 1, 'force_checkout', 'Force checkout if a limitation exists'), ( 1, 'manage_restrictions', 'Manage restrictions for accounts'), - ( 1, 'manage_checkout_nots', 'Mark checkout notes as seen/not seen'), + ( 1, 'manage_checkout_notes', 'Mark checkout notes as seen/not seen'), ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'), ( 3, 'manage_circ_rules', 'Manage circulation rules'), ( 4, 'edit_borrowers', 'Add, modify and view patron information'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt index 62c087d80c..3ec45f9cd5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt @@ -1,79 +1,11 @@ [% USE Koha %] [% USE KohaDates %] [% USE Branches %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Home › Circulation › Checkout Notes +Home › Circulation › Checkout notes [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] - -[% INCLUDE 'calendar.inc' %] - [% INCLUDE 'header.inc' %] [% INCLUDE 'circ-search.inc' %] @@ -131,7 +63,7 @@ [% note.item.biblio.title %] - [% note.item.biblio.author %] ([% note.item.barcode %]) [% note.note %] [% note.notedate | $KohaDates %] - [% IF note.patron.title %][% note.patron.title [% END %][% note.patron.firstname %] [% note.patron.surname %] ([% note.patron.cardnumber %]) + [% IF note.patron.title %][% note.patron.title %][% END %][% note.patron.firstname %] [% note.patron.surname %] ([% note.patron.cardnumber %]) [% IF ( note.noteseen == 0 ) %] Not seen @@ -175,4 +107,76 @@ +[% MACRO jsinclude BLOCK %] + + [% INCLUDE 'calendar.inc' %] + [% INCLUDE 'datatables.inc' %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index 59cc74698b..55048c0b84 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -125,7 +125,7 @@
[%# Following statement must be in one line for translatability %] - [% IF ( ( CAN_user_tools_moderate_comments && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_acquisition && pendingsuggestions ) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests) %] + [% IF ( ( CAN_user_tools_moderate_comments && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_acquisition && pendingsuggestions ) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests) || ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes ) %]
[% IF pending_article_requests %]
-- 2.11.0