Bugzilla – Attachment 79136 Details for
Bug 17877
Show internal and vendor note in acquisition info on subscription detail page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17877: Add columns settings to the orders table on subscription-detail
Bug-17877-Add-columns-settings-to-the-orders-table.patch (text/plain), 4.41 KB, created by
Biblibre Sandboxes
on 2018-09-20 08:45:47 UTC
(
hide
)
Description:
Bug 17877: Add columns settings to the orders table on subscription-detail
Filename:
MIME Type:
Creator:
Biblibre Sandboxes
Created:
2018-09-20 08:45:47 UTC
Size:
4.41 KB
patch
obsolete
>From 315c0cdd7c164c68258f4a0b22f9577a9f22c5cd Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 19 Sep 2018 19:45:12 -0300 >Subject: [PATCH] Bug 17877: Add columns settings to the orders table on > subscription-detail >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Test plan: >- Apply this patch and make sure to restart memcached (to re-read the yaml >file that is cached) >- Go to Home ⺠Administration ⺠Columns settings >- Confirm that a new "Serials" tab contain the different columns of the >"Acquisition details" table displayed on the subscription detail page >(if an order exist for this subscription) >- Play with it >- Go to Home ⺠Serials ⺠Details for subscription #ID >- Confirm that the "Column visibility" button is now displayed on top of >the table that it works correctly. > >Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> >--- > admin/columns_settings.yml | 22 ++++++++++++++++++++++ > .../prog/en/modules/admin/columns_settings.tt | 6 ++++++ > .../prog/en/modules/serials/subscription-detail.tt | 7 +++++-- > 3 files changed, 33 insertions(+), 2 deletions(-) > >diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml >index 3e2a672..4e6b579 100644 >--- a/admin/columns_settings.yml >+++ b/admin/columns_settings.yml >@@ -568,3 +568,25 @@ modules: > columnname: serial_status > - > columnname: serial_notes >+ >+ serials: >+ subscription-detail: >+ orders: >+ - >+ columnname: invoice >+ - >+ columnname: basket >+ - >+ columnname: ordernumber >+ - >+ columnname: creation_date >+ - >+ columnname: receive_date >+ - >+ columnname: status >+ - >+ columnname: fund >+ - >+ columnname: ordered >+ - >+ columnname: spent >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >index b41b653..ebcd53e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >@@ -158,6 +158,12 @@ > [% PROCESS pagelist module=modules.reports modulename="reports" %] > </div> > >+ <h3><a href="#serials">Serials</a></h3> >+ <div id="serials"> >+ <h4>Serials tables</h4> >+ [% PROCESS pagelist module=modules.serials modulename="serials" %] >+ </div> >+ > </div> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index e8e8364..498ceb2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -5,6 +5,7 @@ > [% USE Branches %] > [% USE AuthorisedValues %] > [% USE Price %] >+[% USE ColumnsSettings %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials › Details for subscription #[% subscriptionid | html %]</title> >@@ -420,6 +421,7 @@ > </script> > [% Asset.js("js/serials-toolbar.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >+ [% INCLUDE 'columns_settings.inc' %] > <script type="text/javascript"> > // the english words used in display purposes > var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose Hemisphere:"),_("Northern"),_("Southern", >@@ -431,14 +433,15 @@ > return false; > }) > >- var table = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, { >+ var columns_settings = [% ColumnsSettings.GetColumns( 'serials', 'subscription-detail', 'orders', 'json' ) | $raw %]; >+ var table = KohaTable("orders", { > 'bPaginate': false, > 'bAutoWidth': false, > "aaSorting": [[ 5, "asc" ], [ 2, "desc" ]], // Order by status then ordernumber > "aoColumnDefs": [ > { "aTargets": "title-string", "sType": "title-string" } > ] >- })); >+ }, columns_settings); > > $("#hide_received_orders").click(function(e){ > e.preventDefault(); >-- >2.7.4
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 17877
:
79127
|
79128
|
79136
|
79137
|
79355
|
79356