Bugzilla – Attachment 69736 Details for
Bug 19560
Unable to delete library when branchcode contains special characters
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19560: Correctly escape branchcode in admin/branches.pl
Bug-19560-Correctly-escape-branchcode-in-adminbran.patch (text/plain), 5.24 KB, created by
Owen Leonard
on 2017-12-12 14:11:33 UTC
(
hide
)
Description:
Bug 19560: Correctly escape branchcode in admin/branches.pl
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2017-12-12 14:11:33 UTC
Size:
5.24 KB
patch
obsolete
>From 636d16a39cce93759be5b1a08a5e19e3efdaae2b Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 29 Nov 2017 15:24:40 -0300 >Subject: [PATCH] Bug 19560: Correctly escape branchcode in admin/branches.pl > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../prog/en/modules/admin/branches.tt | 24 +++++++++++++--------- > 1 file changed, 14 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index 945fe2e..7964e69 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -1,13 +1,13 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Libraries and groups > [% IF op == 'editcategory' %] >- ›[% IF category.categorycode %]Edit group [% category.categorycode%][% ELSE %]New group[% END %] >+ › [% IF category.categorycode %] Edit group [% category.categorycode%] [% ELSE %] New group [% END %] > [% ELSIF op == 'delete_confirm_category' %] > › Confirm deletion of group [% category.categorycode %] > [% ELSIF op == 'add_form' %] >- ›[% IF library %]Modify library[% ELSE %]New library [% library.branchcode %][% END %] >+ › [% IF library %] Modify library [% library.branchcode | html %] [% ELSE %] New library [% END %] > [% ELSIF op == 'delete_confirm' %] >- › Confirm deletion of library '[% library.branchcode %]' >+ › Confirm deletion of library '[% library.branchcode | html %]' > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -63,13 +63,13 @@ tinyMCE.init({ > › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> > › <a href="/cgi-bin/koha/admin/branches.pl">Libraries and groups</a> > [% IF op == 'add_form_category' %] >-› [% IF category.categorycode %]Edit group [% category.categorycode %][% ELSE %]New group[% END %] >+› [% IF category.categorycode %] Edit group [% category.categorycode %] [% ELSE %] New group [% END %] > [% ELSIF op == 'delete_confirm_category' %] > › Confirm deletion of group [% category.categorycode %] > [% ELSIF op == 'add_form' %] >-› [% IF library %]Modify library[% ELSE %]New library [% library.branchcode %][% END %] >+› [% IF library %] Modify library [% library.branchcode | html %] [% ELSE %] New library [% END %] > [% ELSIF op == 'delete_confirm' %] >-› Confirm deletion of library '[% library.branchcode %]' >+› Confirm deletion of library '[% library.branchcode | html %]' > [% END %] > </div> > >@@ -143,7 +143,7 @@ tinyMCE.init({ > [% IF library %] > <span class="label">Library code: </span> > <input type="hidden" name="branchcode" value="[% library.branchcode |html %]" /> >- [% library.branchcode %] >+ [% library.branchcode | html %] > [% ELSE %] > <label for="branchcode" class="required">Library code: </label> > <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% library.branchcode |html %]" class="required" required="required" /> >@@ -205,7 +205,7 @@ tinyMCE.init({ > [% IF op == 'delete_confirm' and not ( items_count or patrons_count )%] > <div class="dialog alert"> > <form action="/cgi-bin/koha/admin/branches.pl" method="post"> >- <h3>Are you sure you want to delete [% library.branchname |html %] ([% library.branchcode %])?</h3> >+ <h3>Are you sure you want to delete [% library.branchname |html %] ([% library.branchcode | html %])?</h3> > <input type="hidden" name="op" value="delete_confirmed" /> > <input type="hidden" name="branchcode" value="[% library.branchcode |html %]" /> > <input type="hidden" name="branchname" value="[% library.branchname |html %]"> >@@ -272,8 +272,12 @@ tinyMCE.init({ > <td>[% library.marcorgcode %]</td> > <td>[% library.branchip %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode=[% library.branchcode %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?op=delete_confirm&branchcode=[% library.branchcode %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode=[% library.branchcode |uri %]"><i class="fa fa-pencil"></i> Edit</a> >+ <form action="/cgi-bin/koha/admin/branches.pl" method="post"> >+ <input type="hidden" name="branchcode" value="[% library.branchcode |html %]" /> >+ <input type="hidden" name="op" value="delete_confirm" /> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> >+ </form> > </td> > </tr> > [% END %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19560
:
69062
|
69097
|
69130
|
69423
|
69490
|
69700
|
69701
|
69735
|
69736
|
69775