Attachment #173449 for bug #33484

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




    my $columns = $list->{modules}{$module}{$page}{$tablename}{columns} || [];

    # Assign default value if does not exist
    $columns = [
        map {
            {
                cannot_be_toggled  => exists $_->{cannot_be_toggled}  ? $_->{cannot_be_toggled}  : 0,
                cannot_be_modified => exists $_->{cannot_be_modified} ? $_->{cannot_be_modified} : 0,
                is_hidden          => exists $_->{is_hidden}          ? $_->{is_hidden}          : 0,
                default_save_state => exists $_->{default_save_state} ? $_->{default_save_state} : 1,
                columnname         => $_->{columnname},
            }
        } @$columns
    ];

    return $columns;
}

    )->next;

    return {
        default_display_length => $rs
            ? $rs->default_display_length
            : $list->{modules}{$module}{$page}{$tablename}{default_display_length},
        default_sort_order => $rs
            ? $rs->default_sort_order
            : $list->{modules}{$module}{$page}{$tablename}{default_sort_order},
        default_save_state => $rs
            ? $rs->default_save_state
            : 1,
    };
}


Lines 9-15 return { Link Here

(-)a/installer/data/mysql/atomicupdate/bug_33484.pl (-1 / +1 lines)
9	if ( !column_exists( 'tables_settings', 'default_save_state' ) ) {	9	if ( !column_exists( 'tables_settings', 'default_save_state' ) ) {
10	$dbh->do(q{	10	$dbh->do(q{
11	ALTER TABLE tables_settings	11	ALTER TABLE tables_settings
12	ADD COLUMN default_save_state tinyint(1) DEFAULT NULL AFTER default_sort_order	12	ADD COLUMN default_save_state tinyint(1) DEFAULT 1 AFTER default_sort_order
13	});	13	});
14	say $out "Added column 'tables_settings.default_save_state'";	14	say $out "Added column 'tables_settings.default_save_state'";
15	}	15	}

Lines 6238-6244 CREATE TABLE `tables_settings` ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (-2 / +1 lines)
6238	`tablename` varchar(255) NOT NULL,	6238	`tablename` varchar(255) NOT NULL,
6239	`default_display_length` smallint(6) DEFAULT NULL,	6239	`default_display_length` smallint(6) DEFAULT NULL,
6240	`default_sort_order` varchar(255) DEFAULT NULL,	6240	`default_sort_order` varchar(255) DEFAULT NULL,
6241	`default_save_state` tinyint(1) DEFAULT NULL,	6241	`default_save_state` tinyint(1) DEFAULT 1,
6242	PRIMARY KEY (`module`(191),`page`(191),`tablename`(191))	6242	PRIMARY KEY (`module`(191),`page`(191),`tablename`(191))
6243	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;	6243	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
6244	/!40101 SET character_set_client = @saved_cs_client /;	6244	/!40101 SET character_set_client = @saved_cs_client /;
6245	-

Return to bug 33484

Lines 57-70 sub get_columns { Link Here

(-)a/C4/Utils/DataTables/TablesSettings.pm (-14 / +20 lines)
57	my $columns = $list->{modules}{$module}{$page}{$tablename}{columns} \|\| [];	57	my $columns = $list->{modules}{$module}{$page}{$tablename}{columns} \|\| [];
58		58
59	# Assign default value if does not exist	59	# Assign default value if does not exist
60	$columns = [ map {	60	$columns = [
61	{	61	map {
62	cannot_be_toggled => exists $_->{cannot_be_toggled} ? $_->{cannot_be_toggled} : 0,	62	{
63	cannot_be_modified => exists $_->{cannot_be_modified} ? $_->{cannot_be_modified} : 0,	63	cannot_be_toggled => exists $_->{cannot_be_toggled} ? $_->{cannot_be_toggled} : 0,
64	is_hidden => exists $_->{is_hidden} ? $_->{is_hidden} : 0,	64	cannot_be_modified => exists $_->{cannot_be_modified} ? $_->{cannot_be_modified} : 0,
65	columnname => $_->{columnname},	65	is_hidden => exists $_->{is_hidden} ? $_->{is_hidden} : 0,
66	}	66	default_save_state => exists $_->{default_save_state} ? $_->{default_save_state} : 1,
67	} @$columns ];	67	columnname => $_->{columnname},
		68	}
		69	} @$columns
		70	];
68		71
69	return $columns;	72	return $columns;
70	}	73	}
Lines 100-111 sub get_table_settings { Link Here
100	)->next;	103	)->next;
101		104
102	return {	105	return {
103	default_display_length => $rs ? $rs->default_display_length	106	default_display_length => $rs
104	: $list->{modules}{$module}{$page}{$tablename}{default_display_length},	107	? $rs->default_display_length
105	default_sort_order => $rs ? $rs->default_sort_order	108	: $list->{modules}{$module}{$page}{$tablename}{default_display_length},
106	: $list->{modules}{$module}{$page}{$tablename}{default_sort_order},	109	default_sort_order => $rs
107	default_save_state => $rs ? $rs->default_save_state	110	? $rs->default_sort_order
108	: $list->{modules}{$module}{$page}{$tablename}{default_save_state},	111	: $list->{modules}{$module}{$page}{$tablename}{default_sort_order},
		112	default_save_state => $rs
		113	? $rs->default_save_state
		114	: 1,
109	};	115	};
110	}	116	}
111		117