Merge branch 'bug_9719' into 3.14-master

[koha.git] / admin / branches.pl

diff --git a/admin/branches.pl b/admin/branches.pl
index c12762d..026d983 100755 (executable)
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -63,7 +63,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1},
+        flagsrequired   => { parameters => 'parameters_remaining_permissions'},
         debug           => 1,
     }
 );
@@ -168,6 +168,8 @@ elsif ( $op eq 'addcategory_validate' ) {
     $template->param( else => 1 );
     # confirm settings change...
     my $params = $input->Vars;
+    $params->{'show_in_pulldown'} = ( $params->{'show_in_pulldown'} eq 'on' ) ? 1 : 0;
+
     unless ( $params->{'categorycode'} && $params->{'categoryname'} ) {
         default("MESSAGE4",$template);
     }
@@ -294,6 +296,7 @@ sub editcatform {
             categorycode    => $data->{'categorycode'},
             categoryname    => $data->{'categoryname'},
             codedescription => $data->{'codedescription'},
+            show_in_pulldown => $data->{'show_in_pulldown'},
                );
     }
        for my $ctype (GetCategoryTypes()) {