From 1578a822d9203628e00ed957c6f669a226ee5997 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 7 Nov 2018 12:16:08 +0000 Subject: [PATCH] Bug 21777: Fix circulation table alignment TO test: 1 - Check out an item to a patron 2 - Note the columns are misaligned 3 - Apply patch 4 - Updatedatabase 5 - Reload the patron 6 - Note the table is fixed Signed-off-by: Jonathan Druart --- admin/columns_settings.yml | 5 +++++ .../Bug_21777_Hide_column_for_sorting_checkout_on.perl | 9 +++++++++ .../intranet-tmpl/prog/en/includes/checkouts-table-footer.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 installer/data/mysql/atomicupdate/Bug_21777_Hide_column_for_sorting_checkout_on.perl diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 14800190c3..cabd03ceb2 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -494,6 +494,11 @@ modules: - columnname: homebranch - + columnname: checkout_on_unformatted + cannot_be_toggled: 1 + cannot_be_modified: 1 + is_hidden: 1 + - columnname: checkout_on - columnname: checkout_from diff --git a/installer/data/mysql/atomicupdate/Bug_21777_Hide_column_for_sorting_checkout_on.perl b/installer/data/mysql/atomicupdate/Bug_21777_Hide_column_for_sorting_checkout_on.perl new file mode 100644 index 0000000000..0f19e8ca55 --- /dev/null +++ b/installer/data/mysql/atomicupdate/Bug_21777_Hide_column_for_sorting_checkout_on.perl @@ -0,0 +1,9 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do( q{ + INSERT IGNORE INTO columns_settings (module, page, tablename, columnname, cannot_be_toggled, is_hidden) VALUES + ("circ", "circulation", "issues-table", "checkout_on_unformatted", 1, 1); + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 21777: Fix circulation table alignment)\n"; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc index b831c1e507..d8f1abb438 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc @@ -1,6 +1,6 @@ - Totals: + Totals: [% totaldue | html %] [% finetotal | html %] [% totalprice | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc index d78e001da0..7b4b622762 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -19,6 +19,7 @@ Collection Location Home library +   Checked out on Checked out from Call no -- 2.11.0