From fcba4fed0dfc0455bc4045d62ede138f408410c2 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 12 Jun 2018 17:02:30 -0300 Subject: [PATCH] Bug 17698: (QA follow-up) Fix minors design issues This patch includes some changes required on comment 57: 1. Bad resolution conflict, permission self_checkout is re-add 2. The IGNORE modifier is missing in the INSERT statement 4. When I hit /circ/checkout-notes.pl from the side bar, the page displays "Checkout notes", nothing else. We should add "There is no checkout notes". 7. I would display the table on the confirmation screen as well 10. html filters are missing 11. span element should surround translatable string, to help translators 14. patron-title.inc must be used to display patron's info --- circ/checkout-notes.pl | 4 +- ...698_add-permission-to-manage-checkout-notes.sql | 2 +- installer/data/mysql/userpermissions.sql | 1 - .../prog/en/modules/circ/checkout-notes.tt | 113 ++++++++++----------- 4 files changed, 59 insertions(+), 61 deletions(-) diff --git a/circ/checkout-notes.pl b/circ/checkout-notes.pl index b0638f4525..5bad39a4bf 100755 --- a/circ/checkout-notes.pl +++ b/circ/checkout-notes.pl @@ -38,11 +38,9 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( ); my $pending_checkout_notes = Koha::Checkouts->search({ noteseen => 0 })->count; -my @notes = Koha::Checkouts->search({ 'me.note' => { '!=', undef } }, { prefetch => [ 'borrower', { item => 'biblionumber' } ] }); $template->param( pending_checkout_notes => $pending_checkout_notes, - notes => \@notes, ); my $action; @@ -65,9 +63,11 @@ if ( $action eq 'seen' ) { } } +my $notes = Koha::Checkouts->search({ 'me.note' => { '!=', undef } }, { prefetch => [ 'borrower', { item => 'biblionumber' } ] }); $template->param( selected_count => scalar(@issue_ids), action => $action, + notes => $notes, ); output_html_with_http_headers $query, $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 86d4351d1f..ce3bd8f373 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_notes', 'Mark checkout notes as seen/not seen'); +INSERT IGNORE 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 e61c91f41f..d12241edc1 100644 --- a/installer/data/mysql/userpermissions.sql +++ b/installer/data/mysql/userpermissions.sql @@ -4,7 +4,6 @@ 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, 'self_checkout', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID'), ( 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'), 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 05533e734a..cd02e65612 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 @@ -28,72 +28,71 @@ [% IF ( selected_count ) %]
[% IF ( action == 'seen' ) %] - [% selected_count %] note(s) marked as seen. + [% selected_count %] note(s) marked as seen. [% ELSIF ( action == 'notseen' ) %] - [% selected_count %] note(s) marked as not seen. + [% selected_count %] note(s) marked as not seen. [% ELSE %] - Failed to change the status of [% selected_count %] item(s). + Failed to change the status of [% selected_count %] item(s). [% END %]
- Return to checkout notes - [% ELSE %] + [% END %] + + [% IF ( notes.count ) %] +
+ Select all | Clear all +
+ +
+ + + + + + + + + + + + + + + [% FOREACH note IN notes %] + + + + + + + + + + [% END %] + +
 TitleNoteDateSet byStatusActions
[% note.item.biblio.title %] - [% note.item.biblio.author %] ([% note.item.barcode %])[% note.note | html %][% note.notedate | $KohaDates %][% INCLUDE 'patron-title.inc' patron => note.patron hide_patron_infos_if_needed=1 %] + [% IF ( note.noteseen == 0 ) %] + Not seen + [% ELSIF ( note.noteseen == 1 ) %] + Seen + [% END %] + + [% IF ( note.noteseen == 1 ) %] + + [% ELSIF ( note.noteseen == 0 ) %] + + [% END %] +
- [% IF ( notes ) %]
- Select all | Clear all + +
- +
- - - - - - - - - - - - - - [% FOREACH note IN notes %] - - - - - - - - - - [% END %] - -
 TitleNoteDateSet byStatusActions
[% 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.noteseen == 0 ) %] - Not seen - [% ELSIF ( note.noteseen == 1 ) %] - Seen - [% END %] - - [% IF ( note.noteseen == 1 ) %] - - [% ELSIF ( note.noteseen == 0 ) %] - - [% END %] -
- -
- - -
- - - - [% END %] - - [% END %] + [% ELSE %] + There are currently no checkout notes. + [% END %] -- 2.11.0