Bugzilla – Attachment 134155 Details for
Bug 29648
Make KohaTable tables 'default length' and 'default sort' configurable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29648: ILL - no change
Bug-29648-ILL---no-change.patch (text/plain), 6.53 KB, created by
Katrin Fischer
on 2022-04-27 16:39:19 UTC
(
hide
)
Description:
Bug 29648: ILL - no change
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-04-27 16:39:19 UTC
Size:
6.53 KB
patch
obsolete
>From 22450686ee1069bcdbee227dd4fbe9ae9fe9d38e Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 16 Dec 2021 13:13:27 +0100 >Subject: [PATCH] Bug 29648: ILL - no change > >No change expected here for ILL > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/ill/ill-requests.tt | 2 +- > .../prog/en/modules/members/ill-requests.tt | 2 +- > .../intranet-tmpl/prog/js/ill-availability.js | 80 ++++++++++--------- > .../intranet-tmpl/prog/js/ill-list-table.js | 5 +- > 4 files changed, 46 insertions(+), 43 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index 1d93ea2541..fea00c097c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -838,7 +838,7 @@ > <script> > var prefilters = '[% prefilters | $raw %]'; > // Set column settings >- var columns_settings = [% TablesSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %]; >+ var table_settings = [% TablesSettings.GetTableSettings( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %]; > > [% IF services_json.length > 0 %] > var services = [% services_json | $raw %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >index 0f41827757..587517c0a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >@@ -59,7 +59,7 @@ > <script> > var prefilters = '[% prefilters | html %]'; > // Set column settings >- var columns_settings = [% TablesSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %]; >+ var table_settings = [% TablesSettings.GetTableSettings( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %]; > </script> > [% INCLUDE 'ill-list-table-strings.inc' %] > [% Asset.js("js/ill-list-table.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js b/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js >index fd9a5845b0..dfcef7e43b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js >@@ -188,51 +188,53 @@ $(document).ready(function() { > // Initialise the table > // Since we're not able to use the columns settings in core, > // we need to mock the object that it would return >- var columns_settings = [ >- { >- cannot_be_modified: 0, >- cannot_be_toggled: 0, >- columnname: 'source', >- is_hidden: 0 >- }, >- { >- cannot_be_modified: 0, >- cannot_be_toggled: 0, >- columnname: 'title', >- is_hidden: 0 >- }, >- { >- cannot_be_modified: 0, >- cannot_be_toggled: 0, >- columnname: 'author', >- is_hidden: 0 >- }, >- { >- cannot_be_modified: 0, >- cannot_be_toggled: 0, >- columnname: 'isbn', >- is_hidden: 0 >- }, >- { >- cannot_be_modified: 0, >- cannot_be_toggled: 0, >- columnname: 'issn', >- is_hidden: 0 >- }, >- { >- cannot_be_modified: 0, >- cannot_be_toggled: 0, >- columnname: 'date', >- is_hidden: 0 >- } >- ]; >+ var table_settings = { >+ "columns": [ >+ { >+ cannot_be_modified : 0, >+ cannot_be_toggled : 0, >+ columnname : 'source', >+ is_hidden : 0 >+ }, >+ { >+ cannot_be_modified : 0, >+ cannot_be_toggled : 0, >+ columnname : 'title', >+ is_hidden : 0 >+ }, >+ { >+ cannot_be_modified : 0, >+ cannot_be_toggled : 0, >+ columnname : 'author', >+ is_hidden : 0 >+ }, >+ { >+ cannot_be_modified : 0, >+ cannot_be_toggled : 0, >+ columnname : 'isbn', >+ is_hidden : 0 >+ }, >+ { >+ cannot_be_modified : 0, >+ cannot_be_toggled : 0, >+ columnname : 'issn', >+ is_hidden : 0 >+ }, >+ { >+ cannot_be_modified : 0, >+ cannot_be_toggled : 0, >+ columnname : 'date', >+ is_hidden : 0 >+ } >+ ] >+ }; > // Hide pagination buttons if appropriate > tableDef.drawCallback = function() { > var pagination = $(this).closest('.dataTables_wrapper') > .find('.dataTables_paginate'); > pagination.toggle(this.api().page.info().pages > 1); > } >- KohaTable(service.id, tableDef, columns_settings); >+ KohaTable(service.id, tableDef, table_settings); > }); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js b/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js >index 920d6aed68..d6e92cc517 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js >@@ -405,7 +405,8 @@ $(document).ready(function() { > // Assemble an array of column definitions for passing > // to datatables > var colData = []; >- columns_settings.forEach(function(thisCol) { >+ var columns = table_settings['columns']; >+ columns.forEach(function(thisCol) { > var colName = thisCol.columnname; > // Create the base column object > var colObj = $.extend({}, thisCol); >@@ -494,7 +495,7 @@ $(document).ready(function() { > } > > } >- }, columns_settings); >+ }, table_settings); > > // Custom date range filtering > $.fn.dataTable.ext.search.push(function(settings, data, dataIndex) { >-- >2.30.2
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 29648
:
128592
|
128593
|
128594
|
128595
|
128596
|
128597
|
128598
|
128599
|
128600
|
128601
|
128602
|
128603
|
128604
|
128605
|
128606
|
128607
|
128608
|
128609
|
128610
|
128611
|
128612
|
128613
|
128614
|
128615
|
128616
|
128617
|
128618
|
128619
|
128620
|
128621
|
128622
|
128623
|
128624
|
128625
|
128626
|
129084
|
129085
|
129089
|
129352
|
129685
|
129686
|
129770
|
129771
|
129772
|
129773
|
129774
|
129775
|
129776
|
129777
|
129778
|
129779
|
129780
|
129781
|
129782
|
129783
|
129784
|
129785
|
129786
|
129787
|
129788
|
129789
|
129790
|
129791
|
129792
|
129793
|
129794
|
129795
|
129796
|
129797
|
129798
|
129799
|
129800
|
129801
|
129802
|
129803
|
129804
|
129805
|
129806
|
131703
|
131875
|
131876
|
133001
|
133002
|
133003
|
133004
|
133005
|
133006
|
133007
|
133008
|
133009
|
133010
|
133011
|
133012
|
133013
|
133014
|
133015
|
133016
|
133017
|
133018
|
133019
|
133020
|
133021
|
133022
|
133023
|
133024
|
133025
|
133026
|
133027
|
134018
|
134019
|
134020
|
134021
|
134022
|
134023
|
134024
|
134025
|
134026
|
134027
|
134028
|
134029
|
134030
|
134031
|
134032
|
134033
|
134034
|
134035
|
134036
|
134037
|
134038
|
134039
|
134040
|
134041
|
134042
|
134043
|
134044
|
134045
|
134046
|
134047
|
134048
|
134049
|
134050
|
134051
|
134052
|
134053
|
134054
|
134086
|
134087
|
134088
|
134089
|
134090
|
134091
|
134092
|
134093
|
134094
|
134095
|
134096
|
134097
|
134098
|
134099
|
134100
|
134101
|
134102
|
134103
|
134104
|
134105
|
134106
|
134107
|
134108
|
134109
|
134110
|
134111
|
134112
|
134113
|
134114
|
134115
|
134116
|
134117
|
134118
|
134119
|
134120
|
134121
|
134122
|
134123
|
134133
|
134134
|
134135
|
134136
|
134137
|
134138
|
134139
|
134140
|
134141
|
134142
|
134143
|
134144
|
134145
|
134146
|
134147
|
134148
|
134149
|
134150
|
134151
|
134152
|
134153
|
134154
| 134155 |
134156
|
134157
|
134158
|
134159
|
134160
|
134161
|
134162
|
134163
|
134164
|
134165
|
134166
|
134167
|
134168
|
134169
|
134170
|
134171
|
134194