Bug 29857: Make the exception classes inherit from the base class

[srvgit] / admin / categories.pl

diff --git a/admin/categories.pl b/admin/categories.pl
index f160e6e..368960f 100755 (executable)
--- a/admin/categories.pl
+++ b/admin/categories.pl
@@ -22,16 +22,16 @@ use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use C4::Context;
-use C4::Auth;
-use C4::Branch;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Form::MessagingPreferences;
 use Koha::Patrons;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Patron::Categories;
+use Koha::Libraries;
 
-my $input         = new CGI;
+my $input         = CGI->new;
 my $searchfield   = $input->param('description') // q||;
 my $categorycode  = $input->param('categorycode');
 my $op            = $input->param('op') // 'list';
@@ -42,33 +42,14 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/categories.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
-        debug           => 1,
+        flagsrequired   => { parameters => 'manage_patron_categories' },
     }
 );
 
 if ( $op eq 'add_form' ) {
-    my ( $category, $selected_branches );
-    if ($categorycode) {
-        $category          = Koha::Patron::Categories->find($categorycode);
-        $selected_branches = $category->branch_limitations;
-    }
-
-    my $branches = GetBranches;
-    my @branches_loop;
-    foreach my $branchcode ( sort { uc( $branches->{$a}->{branchname} ) cmp uc( $branches->{$b}->{branchname} ) } keys %$branches ) {
-        my $selected = ( grep { $_ eq $branchcode } @$selected_branches ) ? 1 : 0;
-        push @branches_loop,
-          { branchcode => $branchcode,
-            branchname => $branches->{$branchcode}->{branchname},
-            selected   => $selected,
-          };
-    }
 
     $template->param(
-        category => $category,
-        branches_loop       => \@branches_loop,
+        category => scalar Koha::Patron::Categories->find($categorycode),
     );
 
     if ( C4::Context->preference('EnhancedMessagingPreferences') ) {
@@ -90,13 +71,30 @@ elsif ( $op eq 'add_validate' ) {
     my $overduenoticerequired = $input->param('overduenoticerequired');
     my $category_type = $input->param('category_type');
     my $BlockExpiredPatronOpacActions = $input->param('BlockExpiredPatronOpacActions');
+    my $checkPrevCheckout = $input->param('checkprevcheckout');
     my $default_privacy = $input->param('default_privacy');
-    my @branches = grep { $_ ne q{} } $input->param('branches');
+    my $reset_password = $input->param('reset_password');
+    my $change_password = $input->param('change_password');
+    my $exclude_from_local_holds_priority = $input->param('exclude_from_local_holds_priority');
+    my $min_password_length = $input->param('min_password_length');
+    my $require_strong_password = $input->param('require_strong_password');
+    my @branches = grep { $_ ne q{} } $input->multi_param('branches');
+
+    $reset_password = undef if $reset_password eq -1;
+    $change_password = undef if $change_password eq -1;
+    $min_password_length = undef unless length($min_password_length);
+    $require_strong_password = undef if $require_strong_password eq -1;
 
     my $is_a_modif = $input->param("is_a_modif");
 
-    if ( $enrolmentperioddate ) {
-        $enrolmentperioddate = output_pref({ dt => dt_from_string($enrolmentperioddate), dateformat => 'iso' });
+    if ($enrolmentperioddate) {
+        $enrolmentperioddate = output_pref(
+            {
+                dt         => dt_from_string($enrolmentperioddate),
+                dateformat => 'iso',
+                dateonly   => 1,
+            }
+        );
     }
 
     if ($is_a_modif) {
@@ -113,10 +111,16 @@ elsif ( $op eq 'add_validate' ) {
         $category->overduenoticerequired($overduenoticerequired);
         $category->category_type($category_type);
         $category->BlockExpiredPatronOpacActions($BlockExpiredPatronOpacActions);
+        $category->checkprevcheckout($checkPrevCheckout);
         $category->default_privacy($default_privacy);
+        $category->reset_password($reset_password);
+        $category->change_password($change_password);
+        $category->exclude_from_local_holds_priority($exclude_from_local_holds_priority);
+        $category->min_password_length($min_password_length);
+        $category->require_strong_password($require_strong_password);
         eval {
             $category->store;
-            $category->replace_branch_limitations( \@branches );
+            $category->replace_library_limits( \@branches );
         };
         if ( $@ ) {
             push @messages, {type => 'error', code => 'error_on_update' };
@@ -138,11 +142,17 @@ elsif ( $op eq 'add_validate' ) {
             overduenoticerequired => $overduenoticerequired,
             category_type => $category_type,
             BlockExpiredPatronOpacActions => $BlockExpiredPatronOpacActions,
+            checkprevcheckout => $checkPrevCheckout,
             default_privacy => $default_privacy,
+            reset_password => $reset_password,
+            change_password => $change_password,
+            exclude_from_local_holds_priority => $exclude_from_local_holds_priority,
+            min_password_length => $min_password_length,
+            require_strong_password => $require_strong_password,
         });
         eval {
             $category->store;
-            $category->replace_branch_limitations( \@branches );
+            $category->replace_library_limits( \@branches );
         };
 
         if ( $@ ) {