[Koha-cvs] CVS: koha/admin branches.pl,1.16,1.17

[Ambrose Li]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv30002/admin

Modified Files:
        branches.pl 
Log Message:
Converted the categories field in the default listing to a TMPL_LOOP + a
boolean TMPL_VAR


Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** branches.pl 9 Feb 2003 07:41:22 -0000       1.16
--- branches.pl 9 Feb 2003 07:55:13 -0000       1.17
***************
*** 238,242 ****
        # - branchemail    /
        # - address-empty-p (1 if no address information, 0 otherwise)
!       # - categories (FIXME... need to convert this to a TMPL_LOOP too)
        # - value
        # - action
--- 238,244 ----
        # - branchemail    /
        # - address-empty-p (1 if no address information, 0 otherwise)
!       # - categories      (containing a static error message)
!       # - category_list   (loop containing "categoryname")
!       # - no-categories-p (1 if no categories set, 0 otherwise)
        # - value
        # - action
***************
*** 253,267 ****
        }
        $row{'address-empty-p'} = $address_empty_p;
        $row{'address'} = 'Your template is out of date (see bug 180)';
  
        # Handle categories
!       # FIXME. This should be another TMPL_LOOP
!       my $categories = '';
        foreach my $cat (@{$branch->{'categories'}}) {
            my ($catinfo) = @{getcategoryinfo($cat)};
!           $categories .= $catinfo->{'categoryname'}."<br>";
        }
!       $categories = '(no categories set)' unless ($categories);
!       $row{'categories'} = $categories; #FIXME
  
        # Handle all other fields
--- 255,275 ----
        }
        $row{'address-empty-p'} = $address_empty_p;
+       # {{{ Leave this here until bug 180 is completely resolved in templates
        $row{'address'} = 'Your template is out of date (see bug 180)';
+       # }}}
  
        # Handle categories
!       my $no_categories_p = 1;
!       my @categories = '';
        foreach my $cat (@{$branch->{'categories'}}) {
            my ($catinfo) = @{getcategoryinfo($cat)};
!           push @categories, {'categoryname' => $catinfo->{'categoryname'}};
!           $no_categories_p = 0;
        }
!       # {{{ Leave this here until bug 180 is completely resolved in templates
!       $row{'categories'} = 'Your template is out of date (see bug 180)';
!       # }}}
!       $row{'category_list'} = address@hidden;
!       $row{'no-categories-p'} = $no_categories_p;
  
        # Handle all other fields