Bug 31051: DBRev 22.12.00.005

[koha-ffzg.git] / admin / categories.pl

diff --git a/admin/categories.pl b/admin/categories.pl
index f9144e7..53c4182 100755 (executable)
--- a/admin/categories.pl
+++ b/admin/categories.pl
@@ -22,16 +22,15 @@ use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use C4::Context;
-use C4::Auth;
-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::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 +41,14 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/categories.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_patron_categories' },
-        debug           => 1,
     }
 );
 
 if ( $op eq 'add_form' ) {
-    my ( $category, $selected_branches );
-    if ($categorycode) {
-        $category          = Koha::Patron::Categories->find($categorycode);
-        $selected_branches = $category->branch_limitations;
-    }
-
-    my $branches = Koha::Libraries->search( {}, { order_by => ['branchname'] } )->unblessed;
-    my @branches_loop;
-    foreach my $branch ( @$branches ) {
-        my $selected = ( grep { $_ eq $branch->{branchcode} } @$selected_branches ) ? 1 : 0;
-        push @branches_loop,
-          { branchcode => $branch->{branchcode},
-            branchname => $branch->{branchname},
-            selected   => $selected,
-          };
-    }
 
     $template->param(
-        category => $category,
-        branches_loop       => \@branches_loop,
+        category => scalar Koha::Patron::Categories->find($categorycode),
     );
 
     if ( C4::Context->preference('EnhancedMessagingPreferences') ) {
@@ -82,6 +62,7 @@ elsif ( $op eq 'add_validate' ) {
     my $description = $input->param('description');
     my $enrolmentperiod = $input->param('enrolmentperiod');
     my $enrolmentperioddate = $input->param('enrolmentperioddate') || undef;
+    my $password_expiry_days = $input->param('password_expiry_days') || undef;
     my $upperagelimit = $input->param('upperagelimit');
     my $dateofbirthrequired = $input->param('dateofbirthrequired');
     my $enrolmentfee = $input->param('enrolmentfee');
@@ -94,29 +75,26 @@ elsif ( $op eq 'add_validate' ) {
     my $default_privacy = $input->param('default_privacy');
     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');
+    my $can_be_guarantee = $input->param('can_be_guarantee');
 
     $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',
-                dateonly   => 1,
-            }
-        );
-    }
-
     if ($is_a_modif) {
         my $category = Koha::Patron::Categories->find( $categorycode );
         $category->categorycode($categorycode);
         $category->description($description);
         $category->enrolmentperiod($enrolmentperiod);
         $category->enrolmentperioddate($enrolmentperioddate);
+        $category->password_expiry_days($password_expiry_days);
         $category->upperagelimit($upperagelimit);
         $category->dateofbirthrequired($dateofbirthrequired);
         $category->enrolmentfee($enrolmentfee);
@@ -124,14 +102,18 @@ elsif ( $op eq 'add_validate' ) {
         $category->hidelostitems($hidelostitems);
         $category->overduenoticerequired($overduenoticerequired);
         $category->category_type($category_type);
+        $category->can_be_guarantee($can_be_guarantee);
         $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' };
@@ -145,6 +127,7 @@ elsif ( $op eq 'add_validate' ) {
             description => $description,
             enrolmentperiod => $enrolmentperiod,
             enrolmentperioddate => $enrolmentperioddate,
+            password_expiry_days => $password_expiry_days,
             upperagelimit => $upperagelimit,
             dateofbirthrequired => $dateofbirthrequired,
             enrolmentfee => $enrolmentfee,
@@ -152,15 +135,19 @@ elsif ( $op eq 'add_validate' ) {
             hidelostitems => $hidelostitems,
             overduenoticerequired => $overduenoticerequired,
             category_type => $category_type,
+            can_be_guarantee => $can_be_guarantee,
             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 ( $@ ) {