Attachment #172335 for bug #38069

View | Details | Raw Unified | Return to bug 38069
Collapse All | Expand All

Lines 24-30 if ( $op eq 'cud-save' ) { Link Here

(-)a/admin/columns_settings.pl (-2 / +2 lines)
24	my @columnids = $input->multi_param("columnid");	24	my @columnids = $input->multi_param("columnid");
25	my @columns;	25	my @columns;
26	for my $columnid (@columnids) {	26	for my $columnid (@columnids) {
27	next unless $columnid =~ m\|^([^#])#([^#])#(.*)$\|;	27	next unless $columnid =~ m{^([^\\|])\\|([^\\|])\\|(.*)$};
28	my $is_hidden = $input->param( $columnid . '_hidden' ) // 0;	28	my $is_hidden = $input->param( $columnid . '_hidden' ) // 0;
29	my $cannot_be_toggled =	29	my $cannot_be_toggled =
30	$input->param( $columnid . '_cannot_be_toggled' ) // 0;	30	$input->param( $columnid . '_cannot_be_toggled' ) // 0;
Lines 47-53 if ( $op eq 'cud-save' ) { Link Here
47		47
48	my @table_ids = $input->multi_param('table_id');	48	my @table_ids = $input->multi_param('table_id');
49	for my $table_id (@table_ids) {	49	for my $table_id (@table_ids) {
50	next unless $table_id =~ m\|^([^#])#(.)$\|;	50	next unless $table_id =~ m{^([^\\|])\\|(.)$};
51	my $default_display_length = $input->param( $table_id . '_default_display_length' );	51	my $default_display_length = $input->param( $table_id . '_default_display_length' );
52	my $default_sort_order = $input->param( $table_id . '_default_sort_order' );	52	my $default_sort_order = $input->param( $table_id . '_default_sort_order' );
53		53




                    [% IF tables.$pagename.keys and tables.$pagename.keys.size > 1 %]
                        Jump to table:
                        [% FOR tablename IN tables.$pagename.keys.sort %]
                            [% SET table_id = pagename _ '|' _ tablename %]
                            <a href="#[% table_id | uri %]">[% tablename | html %]</a>
                            [% UNLESS loop.last %]<span class="separator"> | </span>[% END %]
                        [% END %]
                    [% END %]
                    [% IF tables.$pagename.keys and tables.$pagename.keys.size > 0 %]
                        [% FOR tablename IN tables.$pagename.keys.sort %]
                            [% SET table_id = pagename _ '|' _ tablename %]
                            <div class="datatable_config" id="[% table_id | html %]">
                                <input type="hidden" name="table_id" value="[% table_id| html %]" />
                                [% IF pagename == 'additem' AND tablename == 'itemst' %]

                                    </thead>
                                    <tbody>
                                        [% FOR column IN tables.$pagename.$tablename.columns %]
                                            [% SET value = pagename _ '|' _ tablename _ '|' _ column.columnname %]
                                            <tr>
                                                <td>
                                                    [% column.columnname | html %]

                                [% IF table_settings.default_sort_order.defined %]
                                    <p>
                                        Default sort order:
                                        <select name="[% pagename | html %]|[% tablename | html %]_default_sort_order">
                                            [% FOR column IN tables.$pagename.$tablename.columns %]
                                                [% IF table_settings.default_sort_order == loop.count - 1 %]
                                                    <option value="[% loop.count - 1 %]" selected="selected">[% column.columnname | html %]</option>
- 

Return to bug 38069

Lines 23-36 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt (-5 / +4 lines)
23	[% IF tables.$pagename.keys and tables.$pagename.keys.size > 1 %]	23	[% IF tables.$pagename.keys and tables.$pagename.keys.size > 1 %]
24	Jump to table:	24	Jump to table:
25	[% FOR tablename IN tables.$pagename.keys.sort %]	25	[% FOR tablename IN tables.$pagename.keys.sort %]
26	[% SET table_id = pagename _ '#' _ tablename %]	26	[% SET table_id = pagename _ '\|' _ tablename %]
27	<a href="#[% table_id \| uri %]">[% tablename \| html %]</a>	27	<a href="#[% table_id \| uri %]">[% tablename \| html %]</a>
28	[% UNLESS loop.last %]<span class="separator"> \| </span>[% END %]	28	[% UNLESS loop.last %]<span class="separator"> \| </span>[% END %]
29	[% END %]	29	[% END %]
30	[% END %]	30	[% END %]
31	[% IF tables.$pagename.keys and tables.$pagename.keys.size > 0 %]	31	[% IF tables.$pagename.keys and tables.$pagename.keys.size > 0 %]
32	[% FOR tablename IN tables.$pagename.keys.sort %]	32	[% FOR tablename IN tables.$pagename.keys.sort %]
33	[% SET table_id = pagename _ '_' _ tablename %]	33	[% SET table_id = pagename _ '\|' _ tablename %]
34	<div class="datatable_config" id="[% table_id \| html %]">	34	<div class="datatable_config" id="[% table_id \| html %]">
35	<input type="hidden" name="table_id" value="[% table_id\| html %]" />	35	<input type="hidden" name="table_id" value="[% table_id\| html %]" />
36	[% IF pagename == 'additem' AND tablename == 'itemst' %]	36	[% IF pagename == 'additem' AND tablename == 'itemst' %]
Lines 57-63 Link Here
57	</thead>	57	</thead>
58	<tbody>	58	<tbody>
59	[% FOR column IN tables.$pagename.$tablename.columns %]	59	[% FOR column IN tables.$pagename.$tablename.columns %]
60	[% SET value = pagename _ '#' _ tablename _ '#' _ column.columnname %]	60	[% SET value = pagename _ '\|' _ tablename _ '\|' _ column.columnname %]
61	<tr>	61	<tr>
62	<td>	62	<td>
63	[% column.columnname \| html %]	63	[% column.columnname \| html %]
Lines 137-143 Link Here
137	[% IF table_settings.default_sort_order.defined %]	137	[% IF table_settings.default_sort_order.defined %]
138	<p>	138	<p>
139	Default sort order:	139	Default sort order:
140	<select name="[% pagename \| html %]#[% tablename \| html %]_default_sort_order">	140	<select name="[% pagename \| html %]\|[% tablename \| html %]_default_sort_order">
141	[% FOR column IN tables.$pagename.$tablename.columns %]	141	[% FOR column IN tables.$pagename.$tablename.columns %]
142	[% IF table_settings.default_sort_order == loop.count - 1 %]	142	[% IF table_settings.default_sort_order == loop.count - 1 %]
143	<option value="[% loop.count - 1 %]" selected="selected">[% column.columnname \| html %]</option>	143	<option value="[% loop.count - 1 %]" selected="selected">[% column.columnname \| html %]</option>
144	-