Bugzilla – Attachment 134142 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: Cities administration view - REST API
Bug-29648-Cities-administration-view---REST-API.patch (text/plain), 5.63 KB, created by
Katrin Fischer
on 2022-04-27 16:37:39 UTC
(
hide
)
Description:
Bug 29648: Cities administration view - REST API
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-04-27 16:37:39 UTC
Size:
5.63 KB
patch
obsolete
>From 8dc3c4199398aa8b93eeaee05ea48d94463bd584 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 16 Dec 2021 12:24:20 +0100 >Subject: [PATCH] Bug 29648: Cities administration view - REST API > >Here we need to deal with the other DT config (in datatables.js, not >columns_settings.inc). > >Test plan: >Same as "normal" > >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> >--- > admin/columns_settings.yml | 2 + > .../prog/en/modules/admin/cities.tt | 4 +- > koha-tmpl/intranet-tmpl/prog/js/datatables.js | 41 ++++++++++++------- > 3 files changed, 31 insertions(+), 16 deletions(-) > >diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml >index f8f518938e..a392306fab 100644 >--- a/admin/columns_settings.yml >+++ b/admin/columns_settings.yml >@@ -197,6 +197,8 @@ modules: > admin: > cities: > table_cities: >+ default_display_length: 20 >+ default_sort_order: 0 > columns: > - > columnname: city_id >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index 0df7eb3bb5..feea946e9e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -214,7 +214,7 @@ > [% INCLUDE 'columns_settings.inc' %] > <script> > >- var columns_settings = [% TablesSettings.GetColumns( 'admin', 'cities', 'table_cities', 'json' ) | $raw %]; >+ var table_settings = [% TablesSettings.GetTableSettings( 'admin', 'cities', 'table_cities', 'json' ) | $raw %]; > $(document).ready(function() { > var cities_table_url = '/api/v1/cities?'; > >@@ -279,7 +279,7 @@ > "orderable": false > } > ] >- }, columns_settings, 1); >+ }, table_settings, 1); > > }); > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js >index c33943df1e..97c017267f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js >@@ -496,13 +496,13 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { > * We extend the options set with the `criteria` key which allows > * the developer to select the match type to be applied during searches > * Valid keys are: `contains`, `starts_with`, `ends_with` and `exact` >- * @param {Object} column_settings The arrayref as returned by TableSettings.GetColums function available >+ * @param {Object} table_settings The arrayref as returned by TableSettings.GetTableSettings function available > * from the columns_settings template toolkit include > * @param {Boolean} add_filters Add a filters row as the top row of the table > * @param {Object} default_filters Add a set of default search filters to apply at table initialisation > * @return {Object} The dataTables instance > */ >- $.fn.kohaTable = function(options, columns_settings, add_filters, default_filters) { >+ $.fn.kohaTable = function(options, table_settings, add_filters, default_filters) { > var settings = null; > > if ( add_filters ) { >@@ -683,19 +683,23 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { > var hidden_ids = []; > var included_ids = []; > >- $(columns_settings).each( function() { >- var named_id = $( 'thead th[data-colname="' + this.columnname + '"]', this ).index( 'th' ); >- var used_id = settings.bKohaColumnsUseNames ? named_id : counter; >- if ( used_id == -1 ) return; > >- if ( this['is_hidden'] == "1" ) { >- hidden_ids.push( used_id ); >- } >- if ( this['cannot_be_toggled'] == "0" ) { >- included_ids.push( used_id ); >- } >- counter++; >- }); >+ if ( table_settings ) { >+ var columns_settings = table_settings['columns']; >+ $(columns_settings).each( function() { >+ var named_id = $( 'thead th[data-colname="' + this.columnname + '"]', this ).index( 'th' ); >+ var used_id = settings.bKohaColumnsUseNames ? named_id : counter; >+ if ( used_id == -1 ) return; >+ >+ if ( this['is_hidden'] == "1" ) { >+ hidden_ids.push( used_id ); >+ } >+ if ( this['cannot_be_toggled'] == "0" ) { >+ included_ids.push( used_id ); >+ } >+ counter++; >+ }); >+ } > > var exportColumns = ":visible:not(.noExport)"; > if( settings.hasOwnProperty("exportColumns") ){ >@@ -799,6 +803,15 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { > settings['orderCellsTop'] = true; > } > >+ if ( table_settings ) { >+ if ( table_settings.hasOwnProperty('default_display_length') && table_settings['default_display_length'] != null ) { >+ settings["pageLength"] = table_settings['default_display_length']; >+ } >+ if ( table_settings.hasOwnProperty('default_sort_order') && table_settings['default_sort_order'] != null ) { >+ settings["order"] = [[ table_settings['default_sort_order'], 'asc' ]]; >+ } >+ } >+ > var table = $(this).dataTable(settings); > > >-- >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