From 2b125a6f93b6e1d7fec743ce6ab3cbf7b96252a8 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmcharlt@gmail.com>
Date: Sun, 14 Feb 2010 21:10:25 -0500
Subject: [PATCH] bug 2885: attempting to add library with existing code now
 gives error message

If one attempts to add a new library with a code already in use,
an error message is shown.  The main library data input by the user
is preserved, allowing the user to try a new code.

This also corrects a glitch in the previous patch concerning
adding a branch category whose code is already in use.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---
 admin/branches.pl                             | 70 ++++++++++++-------
 .../prog/en/modules/admin/branches.tmpl       |  2 +-
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/admin/branches.pl b/admin/branches.pl
index 1d6b1881ad..5277ff4684 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -96,16 +96,28 @@ elsif ( $op eq 'add_validate' ) {
         default("MESSAGE1",$template);
     }
     else {
-        my $error = ModBranch($params); # FIXME: causes warnings to log on duplicate branchcode
-        # if error saving, stay on edit and rise error
-        if ($error) {
-            # 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 );
-        } else {
-            $template->param( else => 1);
-            default("MESSAGE2",$template);
+        my $mod_branch = 1;
+        if ($params->{add}) {
+            my ($existing) =
+                C4::Context->dbh->selectrow_array("SELECT count(*) FROM branches WHERE branchcode = ?", {}, $branchcode);
+            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 );
+            }
+        }
+        if ($mod_branch) {
+            my $error = ModBranch($params); # FIXME: causes warnings to log on duplicate branchcode
+            # if error saving, stay on edit and rise error
+            if ($error) {
+                # 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 );
+            } else {
+                $template->param( else => 1);
+                default("MESSAGE2",$template);
+            }
         }
     }
 }
@@ -155,6 +167,7 @@ elsif ( $op eq 'addcategory_validate' ) {
 	# doing an add must check the code is unique
 	if (CheckCategoryUnique($input->param('categorycode'))){
 	    ModBranchCategoryInfo($params);
+        default("MESSAGE5",$template);
 	}
 	else {
 	    default("MESSAGE9",$template);
@@ -219,22 +232,7 @@ sub editbranchform {
 
         # get the old printer of the branch
         $oldprinter = $data->{'branchprinter'} || '';
-        $innertemplate->param( 
-             branchcode     => $data->{'branchcode'},
-             branch_name    => $data->{'branchname'},
-             branchaddress1 => $data->{'branchaddress1'},
-             branchaddress2 => $data->{'branchaddress2'},
-             branchaddress3 => $data->{'branchaddress3'},
-             branchzip      => $data->{'branchzip'},
-             branchcity     => $data->{'branchcity'},
-             branchcountry  => $data->{'branchcountry'},
-             branchphone    => $data->{'branchphone'},
-             branchfax      => $data->{'branchfax'},
-             branchemail    => $data->{'branchemail'},
-             branchurl      => $data->{'branchurl'},
-             branchip       => $data->{'branchip'},
-             branchnotes    => $data->{'branchnotes'}, 
-        );
+        _branch_to_template($data, $innertemplate);
     }
 
     foreach my $thisprinter ( keys %$printers ) {
@@ -386,6 +384,26 @@ sub branchinfotable {
 
 }
 
+sub _branch_to_template {
+    my ($data, $template) = @_;
+    $template->param( 
+         branchcode     => $data->{'branchcode'},
+         branch_name    => $data->{'branchname'},
+         branchaddress1 => $data->{'branchaddress1'},
+         branchaddress2 => $data->{'branchaddress2'},
+         branchaddress3 => $data->{'branchaddress3'},
+         branchzip      => $data->{'branchzip'},
+         branchcity     => $data->{'branchcity'},
+         branchcountry  => $data->{'branchcountry'},
+         branchphone    => $data->{'branchphone'},
+         branchfax      => $data->{'branchfax'},
+         branchemail    => $data->{'branchemail'},
+         branchurl      => $data->{'branchurl'},
+         branchip       => $data->{'branchip'},
+         branchnotes    => $data->{'branchnotes'}, 
+    );
+}
+
 output_html_with_http_headers $input, $cookie, $template->output;
 
 # Local Variables:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index e05024eda0..4a33946888 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -69,7 +69,7 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add" -->
-    <!-- TMPL_IF name="ERROR1" --><div class="dialog message">Code already exists &mdash; Please enter a unique code</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="ERROR1" --><div class="dialog message">Library with that code already exists &mdash; Please enter a unique code</div><!-- /TMPL_IF -->
   <h3><!-- TMPL_IF name="heading-branches-add-branch-p" -->New library<!-- TMPL_ELSE -->Modify library<!-- /TMPL_IF --></h3>
     <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
 	<fieldset class="rows">
-- 
2.39.5