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

(-)a/admin/categories.pl (+4 lines)
Lines 93-101 elsif ( $op eq 'add_validate' ) { Link Here
93
    my $checkPrevCheckout = $input->param('checkprevcheckout');
93
    my $checkPrevCheckout = $input->param('checkprevcheckout');
94
    my $default_privacy = $input->param('default_privacy');
94
    my $default_privacy = $input->param('default_privacy');
95
    my $reset_password = $input->param('reset_password');
95
    my $reset_password = $input->param('reset_password');
96
    my $change_password = $input->param('change_password');
96
    my @branches = grep { $_ ne q{} } $input->multi_param('branches');
97
    my @branches = grep { $_ ne q{} } $input->multi_param('branches');
97
98
98
    $reset_password = undef if $reset_password eq -1;
99
    $reset_password = undef if $reset_password eq -1;
100
    $change_password = undef if $change_password eq -1;
99
101
100
    my $is_a_modif = $input->param("is_a_modif");
102
    my $is_a_modif = $input->param("is_a_modif");
101
103
Lines 126-131 elsif ( $op eq 'add_validate' ) { Link Here
126
        $category->checkprevcheckout($checkPrevCheckout);
128
        $category->checkprevcheckout($checkPrevCheckout);
127
        $category->default_privacy($default_privacy);
129
        $category->default_privacy($default_privacy);
128
        $category->reset_password($reset_password);
130
        $category->reset_password($reset_password);
131
        $category->change_password($change_password);
129
        eval {
132
        eval {
130
            $category->store;
133
            $category->store;
131
            $category->replace_branch_limitations( \@branches );
134
            $category->replace_branch_limitations( \@branches );
Lines 153-158 elsif ( $op eq 'add_validate' ) { Link Here
153
            checkprevcheckout => $checkPrevCheckout,
156
            checkprevcheckout => $checkPrevCheckout,
154
            default_privacy => $default_privacy,
157
            default_privacy => $default_privacy,
155
            reset_password => $reset_password,
158
            reset_password => $reset_password,
159
            change_password => $change_password,
156
        });
160
        });
157
        eval {
161
        eval {
158
            $category->store;
162
            $category->store;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt (-1 / +32 lines)
Lines 197-202 Link Here
197
                      [% END %]
197
                      [% END %]
198
                    </select>
198
                    </select>
199
                </li>
199
                </li>
200
                <li>
201
                    <label for="change_password">Password change in OPAC: </label>
202
                    <select name="change_password" id="change_password">
203
                      [% IF category.change_password.defined %]
204
                        [% IF category.change_password %]
205
                          [% IF Koha.Preference('OpacPasswordChange') %]
206
                            <option value="-1">Follow system preference OpacPasswordChange (enabled)</option>
207
                          [% ELSE %]
208
                            <option value="-1">Follow system preference OpacPasswordChange (disabled)</option>
209
                          [% END %]
210
                            <option value="1" selected="selected">Allowed</option>
211
                            <option value="0">Not allowed</option>
212
                        [% ELSE %]
213
                          [% IF Koha.Preference('OpacPasswordChange') %]
214
                            <option value="-1">Follow system preference OpacPasswordChange (enabled)</option>
215
                          [% ELSE %]
216
                            <option value="-1">Follow system preference OpacPasswordChange (disabled)</option>
217
                          [% END %]
218
                            <option value="1">Allowed</option>
219
                            <option value="0" selected="selected">Not allowed</option>
220
                        [% END %]
221
                      [% ELSE %]
222
                          [% IF Koha.Preference('OpacPasswordChange') %]
223
                            <option value="-1" selected="selected">Follow system preference OpacPasswordChange (enabled)</option>
224
                          [% ELSE %]
225
                            <option value="-1" selected="selected">Follow system preference OpacPasswordChange (disabled)</option>
226
                          [% END %]
227
                            <option value="1">Allowed</option>
228
                            <option value="0">Not allowed</option>
229
                      [% END %]
230
                    </select>
231
                </li>
200
                <li><label for="block_expired">Block expired patrons:</label>
232
                <li><label for="block_expired">Block expired patrons:</label>
201
                    <select name="BlockExpiredPatronOpacActions" id="block_expired">
233
                    <select name="BlockExpiredPatronOpacActions" id="block_expired">
202
                        [% IF not category or category.BlockExpiredPatronOpacActions == -1%]
234
                        [% IF not category or category.BlockExpiredPatronOpacActions == -1%]
203
- 

Return to bug 10796