Bugzilla – Attachment 85896 Details for
Bug 21063
Allow columns in intranet ILL request datatable to be customisable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21063: (follow-up) Make patron col consistent
Bug-21063-follow-up-Make-patron-col-consistent.patch (text/plain), 7.53 KB, created by
Andrew Isherwood
on 2019-03-01 11:49:54 UTC
(
hide
)
Description:
Bug 21063: (follow-up) Make patron col consistent
Filename:
MIME Type:
Creator:
Andrew Isherwood
Created:
2019-03-01 11:49:54 UTC
Size:
7.53 KB
patch
obsolete
>From 751260f3f61cb9e555960ce7fdee1074f206ab62 Mon Sep 17 00:00:00 2001 >From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com> >Date: Fri, 1 Mar 2019 11:47:16 +0000 >Subject: [PATCH] Bug 21063: (follow-up) Make patron col consistent > >As per comment #44 here: >https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21063#c44 >--- > admin/columns_settings.yml | 4 -- > .../prog/en/modules/ill/ill-requests.tt | 43 +++++++++------------- > 2 files changed, 17 insertions(+), 30 deletions(-) > >diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml >index bd7a9327b2..31a13fc863 100644 >--- a/admin/columns_settings.yml >+++ b/admin/columns_settings.yml >@@ -374,10 +374,6 @@ modules: > - > columnname: orderid > - >- columnname: patron_borrowernumber >- - >- columnname: patron_cardnumber >- - > columnname: patron > - > columnname: biblio_id >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 667c3e1480..ab4b3a916d 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 >@@ -63,8 +63,8 @@ > </select> > </li> > <li> >- <label for="illfilter_barcode">Cardnumber:</label> >- <input type="text" name="illfilter_barcode" id="illfilter_barcode" /> >+ <label for="illfilter_patron">Patron:</label> >+ <input type="text" name="illfilter_patron" id="illfilter_patron" /> > </li> > </ol> > <fieldset class="action"> >@@ -518,8 +518,6 @@ > <th scope="col">Pages</th> > <th scope="col">Type</th> > <th scope="col">Order ID</th> >- <th scope="col">Patron ID</th> >- <th scope="col" class="patron_cardnumber">Patron barcode</th> > <th scope="col">Patron</th> > <th scope="col">Biblio ID</th> > <th scope="col">Branch</th> >@@ -615,7 +613,7 @@ > var sel = $('#illfilter_status option:selected').val(); > if (sel && sel.length > 0) { > activeFilters[me] = function() { >- table.api().column(15).search(sel); >+ table.api().column(13).search(sel); > } > } else { > if (activeFilters.hasOwnProperty(me)) { >@@ -647,7 +645,7 @@ > var sel = $('#illfilter_branchname option:selected').val(); > if (sel && sel.length > 0) { > activeFilters[me] = function() { >- table.api().column(14).search(sel); >+ table.api().column(12).search(sel); > } > } else { > if (activeFilters.hasOwnProperty(me)) { >@@ -660,14 +658,14 @@ > $('#illfilter_branchname').val(''); > } > }, >- barcode: { >+ patron: { > listener: function() { >- var me = 'barcode'; >- $('#illfilter_barcode').change(function() { >- var val = $('#illfilter_barcode').val(); >+ var me = 'patron'; >+ $('#illfilter_patron').change(function() { >+ var val = $('#illfilter_patron').val(); > if (val && val.length > 0) { > activeFilters[me] = function() { >- table.api().column(11).search(val); >+ table.api().column(10).search(val); > } > } else { > if (activeFilters.hasOwnProperty(me)) { >@@ -677,7 +675,7 @@ > }); > }, > clear: function() { >- $('#illfilter_barcode').val(''); >+ $('#illfilter_patron').val(''); > } > }, > dateModified: { >@@ -736,7 +734,8 @@ > if ( row.patron_firstname ) { > patronLink = patronLink + row.patron_firstname + ' '; > } >- patronLink = patronLink + row.patron_surname + '</a>'; >+ patronLink = patronLink + row.patron_surname + >+ ' (' + row.patron_cardnumber + ')' + '</a>'; > return patronLink; > }; > >@@ -841,9 +840,6 @@ > updated: { > name: _("Updated on"), > }, >- patron_cardnumber: { >- name: _("Cardnumber") >- }, > patron: { > skipSanitize: true, > func: createPatronLink >@@ -976,20 +972,15 @@ > { // When sorting 'placed', we want to use the > // unformatted column > 'aTargets': [ 'placed_formatted'], >- 'iDataSort': 16 >+ 'iDataSort': 14 > }, > { // When sorting 'updated', we want to use the > // unformatted column > 'aTargets': [ 'updated_formatted'], >- 'iDataSort': 18 >- }, >- { >- 'aTargets': [ 'patron_cardnumber' ], >- 'bVisible': false, >- 'bSearchable': true >+ 'iDataSort': 16 > } > ], >- 'aaSorting': [[ 18, 'desc' ]], // Default sort, updated descending >+ 'aaSorting': [[ 16, 'desc' ]], // Default sort, updated descending > 'processing': true, // Display a message when manipulating > 'sPaginationType': "full_numbers", // Pagination display > 'deferRender': true, // Improve performance on big datasets >@@ -1020,8 +1011,8 @@ > var placedEnd = $('#illfilter_dateplaced_end').datepicker('getDate'); > var modifiedStart = $('#illfilter_datemodified_start').datepicker('getDate'); > var modifiedEnd = $('#illfilter_datemodified_end').datepicker('getDate'); >- var rowPlaced = data[16] ? new Date(data[16]) : null; >- var rowModified = data[18] ? new Date(data[18]) : null; >+ var rowPlaced = data[14] ? new Date(data[14]) : null; >+ var rowModified = data[16] ? new Date(data[16]) : null; > var placedPassed = true; > var modifiedPassed = true; > if (placedStart && rowPlaced && rowPlaced < placedStart) { >-- >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 21063
:
76940
|
76941
|
76942
|
76943
|
79559
|
79560
|
80690
|
80691
|
80802
|
80841
|
82153
|
82154
|
82155
|
82156
|
82504
|
82505
|
82506
|
82507
|
84405
|
84786
|
84787
|
84788
|
84789
|
84790
|
84862
|
85854
|
85855
|
85869
|
85889
|
85893
|
85894
|
85895
|
85896
|
86060
|
86092
|
86093
|
86094
|
86095
|
86096
|
86097
|
86098
|
86099
|
86100
|
86101
|
86102
|
86103
|
86104
|
86105
|
86106
|
86235