Attachment 51321 Details for Bug 13041 – [3.22.x] Bug 13041: Fix add of basket's manager when name contains a single quote

[patch] [3.22.x] Bug 13041: Fix add of basket's manager when name contains a single quote

Bug-13041-Fix-add-of-baskets-manager-when-name-con.patch (text/plain), 3.85 KB, created by Julian Maurice on 2016-05-09 09:46:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2016-05-09 09:46:20 UTC

Size: 3.85 KB

patch

obsolete

>From 964a1888138e276a78be5d84a70559ace6418e79 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Mon, 9 May 2016 11:42:05 +0200
>Subject: [PATCH] Bug 13041: Fix add of basket's manager when name contains a
> single quote
>
>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.
>
>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.
>
>Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
>---
> 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 1de1934..a2c9b67 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -105,7 +105,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..069a56a 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' -%]
>                         "<a href=\"#\" style='cursor:pointer' onclick='select_user(\"[% data.borrowernumber %]\", [% To.json(data) | html %] );'>Select</a>"
>                     [%- ELSE -%]
>-                        "<a href=\"#\" style='cursor:pointer' onclick='add_user(\"[% data.borrowernumber %]\", \"[% data.firstname %] [% data.surname %]\");'>Select</a>"
>+                        "<a href=\"#\" style='cursor:pointer' data-firstname=\"[% data.firstname %]\" data-surname=\"[% data.surname %]\" onclick=\"add_user('[% data.borrowernumber %]', $(this).data('firstname') + ' ' + $(this).data('surname'));\">Select</a>"
>                     [%- 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 20af6d0..ff8ed90 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
>@@ -192,7 +192,7 @@ function filterByFirstLetterSurname(letter) {
>                     <input class="btn btn-default" type="submit" value="Search" />
>                 </fieldset>
>             </fieldset>
>-        <form>
>+        </form>
> 
>         [% IF patrons_with_acq_perm_only %]
>             <div class="hint">Only staff with superlibrarian or acquisitions permissions (or order_manage permission if granular permissions are enabled) are returned in the search results</div>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 13041: 51188 | 51234 | 51264 | 51266 | 51321