Bugzilla – Attachment 28940 Details for
Bug 10855
Custom fields for subscriptions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10855: FIX encoding issues.
Bug-10855-FIX-encoding-issues.patch (text/plain), 7.33 KB, created by
Jonathan Druart
on 2014-06-18 14:20:25 UTC
(
hide
)
Description:
Bug 10855: FIX encoding issues.
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-06-18 14:20:25 UTC
Size:
7.33 KB
patch
obsolete
>From 70b28525baa47d357c3d2b2a2a7cc54a955544ab Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Thu, 27 Mar 2014 16:44:01 +0100 >Subject: [PATCH] Bug 10855: FIX encoding issues. > >This commit should be reverted when bug 11944 (or replacement) will be >fixed. One day, maybe. >--- > .../intranet-tmpl/prog/en/modules/serials/add_fields.tt | 4 ++-- > .../prog/en/modules/serials/serials-search.tt | 14 +++++++------- > .../prog/en/modules/serials/subscription-add.tt | 6 +++--- > 3 files changed, 12 insertions(+), 12 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >index 27fb232..8b00290 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >@@ -98,7 +98,7 @@ > <tbody> > [% FOR field IN fields %] > <tr> >- <td>[% field.name %]</td> >+ <td>[% field.name | html_entity %]</td> > <td>[% field.authorised_value_category %]</td> > <td>[% field.marcfield %]</td> > <td> >@@ -126,7 +126,7 @@ > <ol> > <li> > <label for="name" class="required">Name: </label> >- <input type="text" name="name" id="name" value="[% field.name | html %]" /> >+ <input type="text" name="name" id="name" value="[% field.name | html_entity %]" /> > </li> > <li> > <label for="av">Authorised value category: </label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index 20f02be..c195704 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -128,12 +128,12 @@ > </li> > [% FOR field IN additional_fields_for_subscription %] > <li> >- <label for="additional_field_[% field.id %]"> [% field.name %]: </label> >+ <label for="additional_field_[% field.id %]"> [% field.name | html_entity %]: </label> > [% IF field.authorised_value_choices %] > <select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter"> > <option value="">All</option> > [% FOREACH av IN field.authorised_value_choices %] >- <option value="[% av.authorised_value %]">[% av.lib %]</option> >+ <option value="[% av.authorised_value %]">[% av.lib | html_entity %]</option> > [% END %] > </select> > [% ELSE %] >@@ -170,7 +170,7 @@ > <th>Call number</th> > <th>Expiration date</th> > [% FOR field IN additional_fields_for_subscription %] >- <th>[% field.name %]</th> >+ <th>[% field.name | html_entity %]</th> > [% END %] > [% IF ( routing && CAN_user_serials_routing ) %] > <th>Routing list</th> >@@ -189,7 +189,7 @@ > <td><input type="text" class="filter" data-column_num="5" placeholder="Search callnumber" /></td> > <td><input type="text" class="filter" data-column_num="6" placeholder="Search expiration date" /></td> > [% FOR field IN additional_fields_for_subscription %] >- <td><input type="text" class="filter" data-column_num="[% loop.count + 6 %]" placeholder="Search [% field.name %]" /></td> >+ <td><input type="text" class="filter" data-column_num="[% loop.count + 6 %]" placeholder="Search [% field.name | html_entity %]" /></td> > [% END %] > [% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %] > <td></td> >@@ -430,15 +430,15 @@ > > [% FOR field IN additional_fields_for_subscription %] > <li> >- <label for="additional_field_[% field.id %]ID"> [% field.name %]: </label> >+ <label for="additional_field_[% field.id %]ID"> [% field.name | html_entity %]: </label> > [% IF field.authorised_value_choices %] > <select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter"> > <option value="">All</option> > [% FOREACH av IN field.authorised_value_choices %] > [% IF av.authorised_value == additional_field_filters.${field.name}.value %] >- <option value="[% av.authorised_value %]" selected="selected">[% av.lib %]</option> >+ <option value="[% av.authorised_value %]" selected="selected">[% av.lib | html_entity %]</option> > [% ELSE %] >- <option value="[% av.authorised_value %]">[% av.lib %]</option> >+ <option value="[% av.authorised_value %]">[% av.lib | html_entity %]</option> > [% END %] > [% END %] > </select> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >index 57f34e7..63b970b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >@@ -829,14 +829,14 @@ $(document).ready(function() { > <ol> > [% FOR field IN additional_fields_for_subscription %] > <li> >- <label for="additional_field_[% field.id %]"> [% field.name %]: </label> >+ <label for="additional_field_[% field.id %]"> [% field.name | html_entity %]: </label> > [% IF field.authorised_value_choices %] > <select name="additional_field_[% field.id %]" id="additional_field_[% field.id %]"> > [% FOREACH av IN field.authorised_value_choices %] > [% IF av.authorised_value == additional_fields.${field.name} %] >- <option value="[% av.authorised_value %]" selected="selected">[% av.lib %]</option> >+ <option value="[% av.authorised_value %]" selected="selected">[% av.lib | html_entity %]</option> > [% ELSE %] >- <option value="[% av.authorised_value %]">[% av.lib %]</option> >+ <option value="[% av.authorised_value %]">[% av.lib | html_entity %]</option> > [% END %] > [% END %] > </select> (Authorised values for [% field.authorised_value_category %]) >-- >2.0.0.rc2
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 10855
:
20937
|
20938
|
20939
|
20940
|
20941
|
20942
|
20943
|
20944
|
21184
|
21185
|
21186
|
21187
|
21188
|
21189
|
21190
|
21191
|
21663
|
22049
|
22050
|
22051
|
22052
|
22053
|
22054
|
22055
|
22056
|
22057
|
22359
|
22360
|
22600
|
22601
|
22602
|
22603
|
22604
|
22605
|
22606
|
22607
|
22608
|
22616
|
22698
|
22699
|
22700
|
22701
|
22702
|
22703
|
22722
|
22768
|
22769
|
22869
|
23052
|
23053
|
23142
|
23143
|
23301
|
23302
|
23594
|
23595
|
23596
|
23597
|
23598
|
23599
|
23600
|
23601
|
23602
|
23774
|
23775
|
23961
|
23962
|
23963
|
23964
|
24452
|
24453
|
24454
|
24455
|
24456
|
24457
|
24569
|
24570
|
26091
|
26092
|
26093
|
26094
|
26095
|
26096
|
26097
|
26254
|
26255
|
26256
|
26257
|
26258
|
26259
|
26260
|
26276
|
26651
|
26655
|
28929
|
28930
|
28931
|
28932
|
28933
|
28934
|
28935
|
28936
|
28937
|
28938
|
28939
|
28940
|
28941
|
29095
|
29161
|
35211
|
35212
|
35213
|
35214
|
35215
|
35216
|
35217
|
35218
|
35219
|
35220
|
35221
|
35309
|
35310
|
35369
|
35556
|
36359
|
36362
|
36363
|
36364
|
36365
|
36366
|
36367
|
36368
|
36369
|
36370
|
36371
|
36372
|
36373
|
36374
|
38549
|
38550
|
38551
|
38552
|
38553
|
38554
|
38555
|
38556
|
38557
|
38558
|
38559
|
38560
|
38561
|
42296
|
42297
|
42298
|
42299
|
42300
|
42301
|
42302
|
42303
|
42304
|
42305
|
42306
|
42307
|
42308
|
42309
|
42310
|
42332
|
42333
|
43076