Merge remote branch 'kc/new/bug_5586' into kcmaster

[srvgit] / admin / branches.pl

diff --git a/admin/branches.pl b/admin/branches.pl
index 5277ff4..758fa32 100755 (executable)
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -13,15 +13,15 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =head1 branches.pl
 
  FIXME: individual fields in branch address need to be exported to templates,
         in order to fix bug 180; need to notify translators
-FIXME: looped html (e.g., list of checkboxes) need to be properly
+ FIXME: looped html (e.g., list of checkboxes) need to be properly
         TMPL_LOOP'ized; doing this properly will fix bug 130; need to
         notify translators
  FIXME: need to implement the branch categories stuff
@@ -34,7 +34,7 @@ FIXME: looped html (e.g., list of checkboxes) need to be properly
 
  Finlay working on this file from 26-03-2002
  Reorganising this branches admin page.....
- 
+
 =cut
 
 use strict;
@@ -131,8 +131,16 @@ elsif ( $op eq 'delete' ) {
     $sthitems->execute( $branchcode, $branchcode );
     $sthborrowers->execute( $branchcode );
     my ($totalitems)     = $sthitems->fetchrow_array;
-    my ($totalborrowers) = $sthitems->fetchrow_array;
-    if ($totalitems or $totalborrowers) {
+    my ($totalborrowers) = $sthborrowers->fetchrow_array;
+    if ($totalitems && !$totalborrowers) {
+        $template->param( else => 1 );
+        default("MESSAGE10", $template);
+    }
+    elsif (!$totalitems && $totalborrowers){
+        $template->param( else => 1 );
+        default("MESSAGE11", $template);
+    }
+    elsif ($totalitems && $totalborrowers){
         $template->param( else => 1 );
         default("MESSAGE7", $template);
     }