X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Fbranches.pl;h=12c49e28ba3dbd80b4e3a0d6ed9bc27241495992;hb=e32e3ba66269186729be6a4eda319a9f7c84072d;hp=758fa32f4a60c048e37a895c7df8dc5f9b2a9348;hpb=5278aa0ca4bb5110741b792b527725280a3ee902;p=koha_gimpoz

diff --git a/admin/branches.pl b/admin/branches.pl
index 758fa32f4a..12c49e28ba 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -76,14 +76,14 @@ $template->param( ($op || 'else') => 1 );
 if ( $op eq 'add' ) {
 
     # If the user has pressed the "add new branch" button.
-    $template->param( 'heading-branches-add-branch-p' => 1 );
+    $template->param( 'heading_branches_add_branch_p' => 1 );
     editbranchform($branchcode,$template);
 
 }
 elsif ( $op eq 'edit' ) {
 
     # if the user has pressed the "edit branch settings" button.
-    $template->param( 'heading-branches-add-branch-p' => 0,
+    $template->param( 'heading_branches_add_branch_p' => 0,
                         'add' => 1, );
     editbranchform($branchcode,$template);
 }
@@ -103,7 +103,7 @@ elsif ( $op eq 'add_validate' ) {
             if ($existing > 0) {
                 $mod_branch = 0;
                 _branch_to_template($params, $template); # preserve most (FIXME) of user's input
-                $template->param( 'heading-branches-add-branch-p' => 1, 'add' => 1, 'ERROR1' => 1 );
+                $template->param( 'heading_branches_add_branch_p' => 1, 'add' => 1, 'ERROR1' => 1 );
             }
         }
         if ($mod_branch) {
@@ -113,7 +113,7 @@ elsif ( $op eq 'add_validate' ) {
                 # copy input parameters back to form
                 # FIXME - doing this doesn't preserve any branch group selections, but good enough for now
                 editbranchform($branchcode,$template);
-                $template->param( 'heading-branches-add-branch-p' => 1, 'add' => 1, "ERROR$error" => 1 );
+                $template->param( 'heading_branches_add_branch_p' => 1, 'add' => 1, "ERROR$error" => 1 );
             } else {
                 $template->param( else => 1);
                 default("MESSAGE2",$template);
@@ -160,7 +160,7 @@ elsif ( $op eq 'delete_confirmed' ) {
 elsif ( $op eq 'editcategory' ) {
 
     # If the user has pressed the "add new category" or "modify" buttons.
-    $template->param( 'heading-branches-edit-category-p' => 1 );
+    $template->param( 'heading_branches_edit_category_p' => 1 );
     editcatform($categorycode,$template);
 }
 elsif ( $op eq 'addcategory_validate' ) {
@@ -189,12 +189,10 @@ elsif ( $op eq 'addcategory_validate' ) {
 elsif ( $op eq 'delete_category' ) {
 
     # if the user has pressed the "delete branch" button.
-    my $message = "MESSAGE8" if CheckBranchCategorycode($categorycode);
-    if ($message) {
+    if ( CheckBranchCategorycode($categorycode) ) {
         $template->param( else => 1 );
-        default($message,$template);
-    }
-    else {
+        default( 'MESSAGE8', $template );
+    } else {
         $template->param( delete_category => 1 );
         $template->param( categorycode    => $categorycode );
     }
@@ -221,7 +219,7 @@ sub default {
     my $innertemplate = shift or return;
     $innertemplate->param($message => 1) if $message;
     $innertemplate->param(
-        'heading-branches-p' => 1,
+        'heading_branches_p' => 1,
     );
     branchinfotable("",$innertemplate);
 }
@@ -256,15 +254,15 @@ sub editbranchform {
     #
     # We export a "categoryloop" array to the template, each element of which
     # contains separate 'categoryname', 'categorycode', 'codedescription', and
-    # 'checked' fields. The $checked field is either '' or 'checked="checked"'
+    # 'checked' fields. The $checked field is either empty or 1'
 
     my $catinfo = GetBranchCategory();
     my @categoryloop = ();
     foreach my $cat (@$catinfo) {
-        my $checked = "";
+        my $checked;
         my $tmp     = quotemeta( $cat->{'categorycode'} );
         if ( grep { /^$tmp$/ } @{ $data->{'categories'} } ) {
-            $checked = "checked=\"checked\"";
+            $checked = 1;
         }
         push @categoryloop, {
             categoryname    => $cat->{'categoryname'},
@@ -343,7 +341,7 @@ sub branchinfotable {
         for my $field (
             'branchaddress1', 'branchaddress2',
             'branchaddress3', 'branchzip',
-            'branchcity', 'branchcountry',
+            'branchcity', 'branchstate', 'branchcountry',
             'branchphone', 'branchfax',
             'branchemail', 'branchurl',
             'branchip',       'branchprinter', 'branchnotes'
@@ -383,7 +381,7 @@ sub branchinfotable {
                 categorytype    => $cat->{'categorytype'},
             };
     	}
-        push @branchcategories, { categorytype => $ctype , $ctype => 1 , catloop => \@categories};
+        push @branchcategories, { categorytype => $ctype , $ctype => 1 , catloop => ( @categories ? \@categories : undef) };
 	}
     $innertemplate->param(
         branches         => \@loop_data,
@@ -402,6 +400,7 @@ sub _branch_to_template {
          branchaddress3 => $data->{'branchaddress3'},
          branchzip      => $data->{'branchzip'},
          branchcity     => $data->{'branchcity'},
+         branchstate    => $data->{'branchstate'},
          branchcountry  => $data->{'branchcountry'},
          branchphone    => $data->{'branchphone'},
          branchfax      => $data->{'branchfax'},