Bugzilla – Attachment 85812 Details for
Bug 15774
Additional fields for baskets
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15774: (follow-up) Add html filters
Bug-15774-follow-up-Add-html-filters.patch (text/plain), 11.53 KB, created by
Josef Moravec
on 2019-02-28 08:07:04 UTC
(
hide
)
Description:
Bug 15774: (follow-up) Add html filters
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2019-02-28 08:07:04 UTC
Size:
11.53 KB
patch
obsolete
>From bb39b38e1cd2a7bba70f07a766e0423ee128273b Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Thu, 4 Oct 2018 19:46:53 +0000 >Subject: [PATCH] Bug 15774: (follow-up) Add html filters >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >--- > .../prog/en/includes/additional-fields-display.inc | 6 ++-- > .../prog/en/includes/additional-fields-entry.inc | 16 ++++----- > .../prog/en/modules/admin/additional-fields.tt | 39 ++++++++++------------ > 3 files changed, 29 insertions(+), 32 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc >index 41771a8fc1..7b2bab777d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc >@@ -1,11 +1,11 @@ > [% USE AuthorisedValues %] > [% FOR field IN available %] > <li> >- <span class="label"> [% field.name %]: </span> >+ <span class="label"> [% field.name | html %]: </span> > [% IF field.authorised_value_category %] >- [% AuthorisedValues.GetByCode( field.authorised_value_category, values.${field.name} ) %] >+ [% AuthorisedValues.GetByCode( field.authorised_value_category, values.${field.name} ) | html %] > [% ELSE %] >- [% values.${field.name} %] >+ [% values.${field.name} | html %] > [% END %] > </li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc >index c8cbd83bcd..d20b7c5b80 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc >@@ -6,24 +6,24 @@ > [% END %] > [% FOR field IN available %] > <li> >- <label for="additional_field_[% field.id %]"> [% field.name %]: </label> >+ <label for="additional_field_[% field.id | html %]"> [% field.name | html %]: </label> > [% IF field.authorised_value_category %] >- <select name="additional_field_[% field.id %]" id="additional_field_[% field.id %]"> >+ <select name="additional_field_[% field.id | html %]" id="additional_field_[% field.id | html %]"> > <option value="">All</option> > [% FOREACH av IN AuthorisedValues.GetAuthValueDropbox( field.authorised_value_category ) %] > [% IF av.authorised_value == values.${field.id} %] >- <option value="[% av.authorised_value %]" selected="selected">[% av.lib %]</option> >+ <option value="[% av.authorised_value | html %]" selected="selected">[% av.lib | html %]</option> > [% ELSE %] >- <option value="[% av.authorised_value %]">[% av.lib %]</option> >+ <option value="[% av.authorised_value | html %]">[% av.lib | html %]</option> > [% END %] > [% END %] >- </select> (Authorised values for [% field.authorised_value_category %]) >+ </select> (Authorised values for [% field.authorised_value_category | html %]) > [% ELSE %] > [% IF field.marcfield %] >- <input type="text" value="[% values.${field.id} %]" id="additional_field_[% field.id %]" name="additional_field_[% field.id %]" readonly="readonly" /> >- This value will be filled with the [% field.marcfield %] subfield of the selected biblio. >+ <input type="text" value="[% values.${field.id} | html %]" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" readonly="readonly" /> >+ This value will be filled with the [% field.marcfield | html %] subfield of the selected biblio. > [% ELSE %] >- <input type="text" value="[% values.${field.id} %]" id="additional_field_[% field.id %]" name="additional_field_[% field.id %]" /> >+ <input type="text" value="[% values.${field.id} | html %]" id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]" /> > [% END %] > [% END %] > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >index bdd6984be5..1d85a8e845 100755 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >@@ -1,15 +1,16 @@ >+[% USE raw %] > [% USE Asset %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › > [% SWITCH op %] >- [% CASE 'add_form' %][% IF field %]Modify additional field '[% field.name %]'[% ELSE %]Add additional field[% END %] >+ [% CASE 'add_form' %][% IF field %]Modify additional field '[% field.name | html %]'[% ELSE %]Add additional field[% END %] > [% CASE %]Manage additional fields > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-[% Asset.css('css/datatables.css') %] >+[% Asset.css('css/datatables.css') | $raw %] > </head> > > [% marcfield_tables = ['subscription'] %] >@@ -22,8 +23,8 @@ > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › > [% SWITCH op %] >- [% CASE 'add_form' %]<a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a> › [% IF field %]Modify field '[% field.name %]'[% ELSE %]Add field[% END %] >- [% CASE 'list' %]<a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a> › Modify fields for '[% tablename %]' >+ [% CASE 'add_form' %]<a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a> › [% IF field %]Modify field '[% field.name | html %]'[% ELSE %]Add field[% END %] >+ [% CASE 'list' %]<a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a> › Modify fields for '[% tablename | html %]' > [% CASE %]Manage additional fields > [% END %] > </div> >@@ -34,7 +35,7 @@ > <div class="yui-b"> > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default btn-sm" id="newfields" href="?op=add_form&tablename=[% tablename %]"><i class="fa fa-plus"></i> Create field</a> >+ <a class="btn btn-default btn-sm" id="newfields" href="?op=add_form&tablename=[% tablename | uri %]"><i class="fa fa-plus"></i> Create field</a> > </div> > [% END %] > >@@ -66,14 +67,14 @@ > <h3>Additional fields</h3> > <p>Select a table:</p> > [% BLOCK table_option %] >- <li><a href="?tablename=[% value %]">[% content %] (<tt>[% value %]</tt>)</a></li> >+ <li><a href="?tablename=[% value | uri %]">[% content | html %] (<tt>[% value | html %]</tt>)</a></li> > [% END %] > <ul> > [% WRAPPER table_option value="aqbasket" %]Order baskets[% END %] > [% WRAPPER table_option value="subscription" %]Subscriptions[% END %] > </ul> > [% ELSIF op == 'list' %] >- <h3>Additional fields for '[% tablename %]'</h3> >+ <h3>Additional fields for '[% tablename | html %]'</h3> > [% IF fields %] > <table id="fieldst"> > <thead> >@@ -90,17 +91,17 @@ > <tbody> > [% FOR field IN fields %] > <tr> >- <td>[% field.name %]</td> >- <td>[% field.authorised_value_category %]</td> >+ <td>[% field.name | html %]</td> >+ <td>[% field.authorised_value_category | html %]</td> > [% IF show_marcfield %] >- <td>[% field.marcfield %]</td> >+ <td>[% field.marcfield | html %]</td> > [% END %] > <td> > [% IF field.searchable %]Yes[% ELSE %]No[% END %] > </td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="?op=add_form&field_id=[% field.id %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="confirmdelete btn btn-default btn-xs" href="?op=delete&field_id=[% field.id %]&tablename=[% tablename %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="?op=add_form&field_id=[% field.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="confirmdelete btn btn-default btn-xs" href="?op=delete&field_id=[% field.id | uri %]&tablename=[% tablename | uri %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -127,17 +128,13 @@ > <label for="av">Authorised value category: </label> > <select name="authorised_value_category"> > <option value="">None</option> >- [% PROCESS options_for_authorised_value_categories >- authorised_value_categories = AuthorisedValues.GetCategories({ >- selected => field.authorised_value_category >- }) >- %] >+ [% PROCESS options_for_authorised_value_categories authorised_value_categories = AuthorisedValues.GetCategories({selected => field.authorised_value_category}) %] > </select> > </li> > [% IF show_marcfield %] > <li> > <label for="marcfield">MARC field: </label> >- <input type="text" name="marcfield" id="marcfield" value="[% field.marcfield %]" /> >+ <input type="text" name="marcfield" id="marcfield" value="[% field.marcfield | html %]" /> > </li> > [% END %] > <li> >@@ -152,12 +149,12 @@ > </fieldset> > <fieldset class="action"> > [% IF field %] >- <input type="hidden" name="field_id" value="[% field.id %]" /> >+ <input type="hidden" name="field_id" value="[% field.id | html %]" /> > [% END %] >- <input type="hidden" name="tablename" value="[% tablename %]" /> >+ <input type="hidden" name="tablename" value="[% tablename | html %]" /> > <input type="hidden" name="op" value="add" /> > <input type="submit" value="Save" /> >- <a href="?tablename=[% tablename %]" class="cancel">Cancel</a> >+ <a href="?tablename=[% tablename | uri %]" class="cancel">Cancel</a> > </fieldset> > </form> > [% END %] >-- >2.11.0
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 15774
:
48224
|
53608
|
53609
|
72078
|
72079
|
72085
|
72086
|
75083
|
75084
|
75085
|
75086
|
75336
|
75354
|
75361
|
79976
|
79977
|
79978
|
79979
|
79980
|
79981
|
79982
|
80060
|
80061
|
80062
|
80063
|
80064
|
80065
|
80066
|
80680
|
81490
|
81491
|
81492
|
81493
|
81494
|
81495
|
81496
|
81497
|
81833
|
81837
|
81838
|
81839
|
81840
|
81841
|
81842
|
81843
|
81844
|
81845
|
81846
|
81847
|
81848
|
81849
|
81850
|
81851
|
81852
|
83349
|
83350
|
83351
|
83352
|
83353
|
83354
|
83355
|
83356
|
83357
|
83358
|
83359
|
83360
|
83361
|
83362
|
83363
|
83364
|
83444
|
83445
|
83446
|
83447
|
83448
|
83449
|
83450
|
83451
|
83452
|
83453
|
83454
|
83455
|
83456
|
83457
|
83458
|
83459
|
85333
|
85334
|
85335
|
85336
|
85337
|
85338
|
85339
|
85340
|
85341
|
85342
|
85343
|
85344
|
85345
|
85346
|
85347
|
85348
|
85792
|
85806
|
85807
|
85808
|
85809
|
85810
|
85811
| 85812 |
85813
|
85814
|
85815
|
85816
|
85817
|
85818
|
85819
|
85820
|
85821
|
85822
|
85823
|
85824
|
86411