X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fbranches.pl;h=c12762d78e23434acfddb967b84eb9598c22143f;hb=67942f7432e8706c460e7f8e36178c0cd60333f7;hp=d6388f526ee1c31c9a38d69ea7b8c9c56ee18271;hpb=8ae5719d1681ffb5bf3dc803de5b80a39b6f3a68;p=koha.git diff --git a/admin/branches.pl b/admin/branches.pl index d6388f526e..c12762d78e 100755 --- a/admin/branches.pl +++ b/admin/branches.pl @@ -254,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'}, @@ -328,6 +328,7 @@ sub branchinfotable { # - branchfax | # - branchemail / # - branchurl / + # - opac_info (can contain HTML) # - address-empty-p (1 if no address information, 0 otherwise) # - categories (containing a static error message) # - category_list (loop containing "categoryname") @@ -343,7 +344,7 @@ sub branchinfotable { 'branchaddress3', 'branchzip', 'branchcity', 'branchstate', 'branchcountry', 'branchphone', 'branchfax', - 'branchemail', 'branchurl', + 'branchemail', 'branchurl', 'opac_info', 'branchip', 'branchprinter', 'branchnotes' ) { @@ -406,6 +407,7 @@ sub _branch_to_template { branchfax => $data->{'branchfax'}, branchemail => $data->{'branchemail'}, branchurl => $data->{'branchurl'}, + opac_info => $data->{'opac_info'}, branchip => $data->{'branchip'}, branchnotes => $data->{'branchnotes'}, );