From dc93a9b1c66dc0fef98948d69e60259bc4838746 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 4 May 2016 09:34:46 -0400 Subject: [PATCH] [PASSED QA] Bug 13041 - Can't add user as manager of basket if name includes a single quote MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If you are trying to add a user as a manager of a basket in acquisitions, a JavaScript error will be triggered if that user has a single quote in their name (e.g. "O'Neil"). This patch corrects the issue by removing the "onclick" attribute and using the JS change made in Bug 16386. Also changed by this patch: Increased the size of the patron search popup and made a correction to some invalid HTML. To test you should have a patron whose name contains a single quote who is also a user with permission to manage acquisitions. - Apply the patch and go to Acquisitions. - Locate an open basket and view the details for that basket. - In the "Managed by" section, click the "Add user" button to trigger the patron search popup. - Search for the patron described above and click the "Add" button. - In the parent window, the patron you chose should have been added to the "Managed by" section. Tested on top of Bug 16383, behaves as expected. Signed-off-by: Marc VĂ©ron Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 2660a17..d2f49ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -126,7 +126,7 @@ window.open( "/cgi-bin/koha/acqui/add_user_search.pl", 'UserSearchPopup', - 'width=740, height=450, scrollbars=yes, toolbar=no,' + 'width=840, height=500, scrollbars=yes, toolbar=no,' ); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt index ef325f3..1bdd8ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt @@ -18,7 +18,7 @@ [%- IF selection_type == 'select' -%] "Select" [%- ELSE -%] - "Select" + " Add" [%- END -%] }[% UNLESS loop.last %],[% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt index 41c83d8..99bb52f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt @@ -199,7 +199,7 @@ function filterByFirstLetterSurname(letter) { -
+
[% IF patrons_with_acq_perm_only %]
Only staff with superlibrarian or acquisitions permissions (or order_manage permission if granular permissions are enabled) are returned in the search results
-- 1.9.1