Bugzilla – Attachment 29161 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 bad merge conflicts
Bug-10855-FIX-bad-merge-conflicts.patch (text/plain), 2.08 KB, created by
Jonathan Druart
on 2014-06-23 08:54:04 UTC
(
hide
)
Description:
Bug 10855: FIX bad merge conflicts
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-06-23 08:54:04 UTC
Size:
2.08 KB
patch
obsolete
>From bfd4d2863c3972f55ebbd7b631d710d0ad9504b5 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Fri, 20 Jun 2014 14:47:32 +0200 >Subject: [PATCH] Bug 10855: FIX bad merge conflicts > >This patch fixes a bad merge conflicts. >--- > .../prog/en/modules/serials/serials-search.tt | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) > >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 c195704..3f3cc54 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 >@@ -11,18 +11,14 @@ > //<![CDATA[ > $(document).ready(function() { > var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, { >- [% IF ( routing && CAN_user_serials_routing ) %] > "aoColumnDefs": [ >+ [% IF ( routing && CAN_user_serials_routing ) %] > { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false }, >- ], > [% ELSE %] >- "aoColumnDefs": [ > { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, >- ], > [% END %] >- "aoColumns": [ >- null,{ "sType": "anti-the" },null,null,null,null,{ "sType": "title-string" } >- [% IF ( routing && CAN_user_serials_routing ) %],null[% END %],null,null >+ { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, >+ { "sType": "title-string", "aTargets" : [ "title-string" ] } > ], > "sPaginationType": "four_button" > } ) ); >@@ -31,9 +27,7 @@ > // FIXME sort function of additional_fields! > "aoColumnDefs": [ > { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, >- ], >- "aoColumns": [ >- null,{ "sType": "anti-the" },null,null,null,null,null,null >+ { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, > ], > "sPaginationType": "four_button" > } ) ); >-- >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