Bugzilla – Attachment 37523 Details for
Bug 13875
Columns configuration - table name cannot contain underscore
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 13875: Columns configuration - Allow underscore in table name
PASSED-QA-Bug-13875-Columns-configuration---Allow-.patch (text/plain), 6.10 KB, created by
Katrin Fischer
on 2015-04-06 10:05:21 UTC
(
hide
)
Description:
[PASSED QA] Bug 13875: Columns configuration - Allow underscore in table name
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2015-04-06 10:05:21 UTC
Size:
6.10 KB
patch
obsolete
>From 0150f50b81910f1ff77c564b5f15f1133cd78b2c Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Thu, 19 Mar 2015 16:39:13 +0100 >Subject: [PATCH] [PASSED QA] Bug 13875: Columns configuration - Allow > underscore in table name > >This is a bug fix for bug the columns configuration feature, and >specialy for bug 13864. > >Test plan: >Apply patches on bug 13864 and save columns for the late orders (in the >columns configuration admin page). >Confirm that they are correctly saved. > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >works as expected > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > admin/columns_settings.pl | 2 +- > .../prog/en/modules/admin/columns_settings.tt | 27 +++++++++++----------- > 2 files changed, 15 insertions(+), 14 deletions(-) > >diff --git a/admin/columns_settings.pl b/admin/columns_settings.pl >index c0c117b..e61782c 100755 >--- a/admin/columns_settings.pl >+++ b/admin/columns_settings.pl >@@ -27,7 +27,7 @@ if ( $action eq 'save' ) { > my @columnids = $input->param("columnid"); > my @columns; > for my $columnid (@columnids) { >- next unless $columnid =~ m|^([^_]*)_([^_]*)_(.*)$|; >+ next unless $columnid =~ m|^([^#]*)#([^#]*)#(.*)$|; > my $is_hidden = $input->param( $columnid . '_hidden' ) // 0; > my $cannot_be_toggled = > $input->param( $columnid . '_cannot_be_toggled' ) // 0; >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 f812709..b1a8565 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 >@@ -22,42 +22,43 @@ > <thead><tr><th>Column name</th><th>Is hidden by default</th><th>Cannot be toggled</th></tr></thead> > <tbody> > [% FOR column IN tables.$pagename.$tablename %] >+ [% SET value = pagename _ '#' _ tablename _ '#' _ column.columnname %] > <tr> > <td> > [% column.columnname %] >- <input type="hidden" name="columnid" value="[% pagename %]_[% tablename %]_[% column.columnname %]" /> >+ <input type="hidden" name="columnid" value="[% value %]" /> > </td> > <td> > [% IF column.is_hidden %] > [% IF column.cannot_be_modified %] >- <input type="checkbox" name="[% pagename %]_[% tablename %]_[% column.columnname %]_hidden" value="1" checked="checked" disabled="disabled" /> >- <input type="hidden" name="[% pagename %]_[% tablename %]_[% column.columnname %]_hidden" value="1" /> >+ <input type="checkbox" name="[% value %]_hidden" value="1" checked="checked" disabled="disabled" /> >+ <input type="hidden" name="[% value %]_hidden" value="1" /> > [% ELSE %] >- <input type="checkbox" name="[% pagename %]_[% tablename %]_[% column.columnname %]_hidden" value="1" checked="checked" /> >+ <input type="checkbox" name="[% value %]_hidden" value="1" checked="checked" /> > [% END %] > [% ELSE %] > [% IF column.cannot_be_modified %] >- <input type="checkbox" name="[% pagename %]_[% tablename %]_[% column.columnname %]_hidden" value="1" disabled="disabled" /> >- <input type="hidden" name="[% pagename %]_[% tablename %]_[% column.columnname %]_hidden" value="0" /> >+ <input type="checkbox" name="[% value %]_hidden" value="1" disabled="disabled" /> >+ <input type="hidden" name="[% value %]_hidden" value="0" /> > [% ELSE %] >- <input type="checkbox" name="[% pagename %]_[% tablename %]_[% column.columnname %]_hidden" value="1" /> >+ <input type="checkbox" name="[% value %]_hidden" value="1" /> > [% END %] > [% END %] > </td> > <td> > [% IF column.cannot_be_toggled %] > [% IF column.cannot_be_modified %] >- <input type="checkbox" name="[% pagename %]_[% tablename %]_[% column.columnname %]_cannot_be_toggled" value="1" checked="checked" disabled="disabled" /> >- <input type="hidden" name="[% pagename %]_[% tablename %]_[% column.columnname %]_cannot_be_toggled" value="1" /> >+ <input type="checkbox" name="[% value %]_cannot_be_toggled" value="1" checked="checked" disabled="disabled" /> >+ <input type="hidden" name="[% value %]_cannot_be_toggled" value="1" /> > [% ELSE %] >- <input type="checkbox" name="[% pagename %]_[% tablename %]_[% column.columnname %]_cannot_be_toggled" value="1" checked="checked" /> >+ <input type="checkbox" name="[% value %]_cannot_be_toggled" value="1" checked="checked" /> > [% END %] > [% ELSE %] > [% IF column.cannot_be_modified %] >- <input type="checkbox" name="[% pagename %]_[% tablename %]_[% column.columnname %]_cannot_be_toggled" value="1" disabled="disabled" /> >- <input type="hidden" name="[% pagename %]_[% tablename %]_[% column.columnname %]_cannot_be_toggled" value="0" /> >+ <input type="checkbox" name="[% value %]_cannot_be_toggled" value="1" disabled="disabled" /> >+ <input type="hidden" name="[% value %]_cannot_be_toggled" value="0" /> > [% ELSE %] >- <input type="checkbox" name="[% pagename %]_[% tablename %]_[% column.columnname %]_cannot_be_toggled" value="1" /> >+ <input type="checkbox" name="[% value %]_cannot_be_toggled" value="1" /> > [% END %] > [% END %] > </td> >-- >1.9.1
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 13875
:
37013
|
37403
|
37518
|
37519
| 37523