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

(-)a/C4/Utils/DataTables/TablesSettings.pm (-1 / +1 lines)
Lines 89-95 sub get_columns { Link Here
89
89
90
Returns the settings for a given table.
90
Returns the settings for a given table.
91
91
92
The settings are default_display_length and default_sort_order.
92
The settings are default_display_length, default_sort_order, default_save_state and default_save_state_search.
93
93
94
=cut
94
=cut
95
95
(-)a/t/db_dependent/TablesSettings.t (-24 / +23 lines)
Lines 23-32 $module->mock( Link Here
23
                admin => {
23
                admin => {
24
                    currency => {
24
                    currency => {
25
                        'currencies-table' => {
25
                        'currencies-table' => {
26
                            default_display_length => 20,
26
                            default_display_length    => 20,
27
                            default_sort_order => 1,
27
                            default_sort_order        => 1,
28
                            default_save_state => 1,
28
                            default_save_state        => 1,
29
                            columns => [
29
                            default_save_state_search => 0,
30
                            columns                   => [
30
                                {
31
                                {
31
                                    columnname         => 'currency',
32
                                    columnname         => 'currency',
32
                                    cannot_be_toggled  => '1',
33
                                    cannot_be_toggled  => '1',
Lines 37-60 $module->mock( Link Here
37
                                    cannot_be_toggled  => '1',
38
                                    cannot_be_toggled  => '1',
38
                                    cannot_be_modified => '1'
39
                                    cannot_be_modified => '1'
39
                                },
40
                                },
40
                                {
41
                                { columnname => 'symbol' },
41
                                    columnname => 'symbol'
42
                                },
43
                                {
42
                                {
44
                                    is_hidden  => '1',
43
                                    is_hidden  => '1',
45
                                    columnname => 'iso_code'
44
                                    columnname => 'iso_code'
46
                                },
45
                                },
47
                                {
46
                                { columnname => 'last_updated' },
48
                                    columnname => 'last_updated'
47
                                { columnname => 'active' },
49
                                },
48
                                { columnname => 'actions' }
50
                                {
51
                                    columnname => 'active'
52
                                },
53
                                {
54
                                    columnname => 'actions'
55
                                }
56
                            ]
49
                            ]
57
                        }
50
                            }
58
                    }
51
                    }
59
                },
52
                },
60
            }
53
            }
Lines 127-132 my $modules_expected = { Link Here
127
                default_display_length => 20,
120
                default_display_length => 20,
128
                default_sort_order => 1,
121
                default_sort_order => 1,
129
                default_save_state => 1,
122
                default_save_state => 1,
123
                default_save_state_search => 0,
130
                columns => [
124
                columns => [
131
                    {
125
                    {
132
                        columnname         => 'currency',
126
                        columnname         => 'currency',
Lines 183-188 for my $m ( keys %$modules ) { Link Here
183
        for my $t ( keys %{ $modules->{$m}{$p} } ) {
177
        for my $t ( keys %{ $modules->{$m}{$p} } ) {
184
            my $columns =
178
            my $columns =
185
              C4::Utils::DataTables::TablesSettings::get_columns( $m, $p, $t );
179
              C4::Utils::DataTables::TablesSettings::get_columns( $m, $p, $t );
180
            # We do not store default_save_state and default_save_state_search in the yml file
181
            # Removing them before comparison
182
            delete $_->{default_save_state} for @$columns;
183
            delete $_->{default_save_state_search} for @$columns;
186
            is_deeply(
184
            is_deeply(
187
                $columns,
185
                $columns,
188
                $modules->{$m}{$p}{$t}{columns},
186
                $modules->{$m}{$p}{$t}{columns},
Lines 192-205 for my $m ( keys %$modules ) { Link Here
192
              C4::Utils::DataTables::TablesSettings::get_table_settings( $m, $p, $t );
190
              C4::Utils::DataTables::TablesSettings::get_table_settings( $m, $p, $t );
193
            is_deeply(
191
            is_deeply(
194
                {
192
                {
195
                    default_display_length => $table_settings->{default_display_length},
193
                    default_display_length    => $table_settings->{default_display_length},
196
                    default_sort_order     => $table_settings->{default_sort_order}
194
                    default_sort_order        => $table_settings->{default_sort_order},
197
                    default_save_state     => $table_settings->{default_save_state}
195
                    default_save_state        => $table_settings->{default_save_state},
196
                    default_save_state_search => $table_settings->{default_save_state_search},
198
                },
197
                },
199
                {
198
                {
200
                    default_display_length => $modules->{$m}{$p}{$t}{default_display_length},
199
                    default_display_length    => $modules->{$m}{$p}{$t}{default_display_length},
201
                    default_sort_order     => $modules->{$m}{$p}{$t}{default_sort_order},
200
                    default_sort_order        => $modules->{$m}{$p}{$t}{default_sort_order},
202
                    default_save_state     => $modules->{$m}{$p}{$t}{default_save_state},
201
                    default_save_state        => $modules->{$m}{$p}{$t}{default_save_state},
202
                    default_save_state_search => $modules->{$m}{$p}{$t}{default_save_state_search},
203
                }
203
                }
204
            );
204
            );
205
        }
205
        }
206
- 

Return to bug 33484