projects
/
koha_gimpoz
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 6086 follow-up Uppercase initial coding guideline fix
[koha_gimpoz]
/
admin
/
branches.pl
diff --git
a/admin/branches.pl
b/admin/branches.pl
index
27d374e
..
12c49e2
100755
(executable)
--- a/
admin/branches.pl
+++ b/
admin/branches.pl
@@
-21,7
+21,7
@@
FIXME: individual fields in branch address need to be exported to templates,
in order to fix bug 180; need to notify translators
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
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.....
Finlay working on this file from 26-03-2002
Reorganising this branches admin page.....
-
+
=cut
use strict;
=cut
use strict;
@@
-76,14
+76,14
@@
$template->param( ($op || 'else') => 1 );
if ( $op eq 'add' ) {
# If the user has pressed the "add new branch" button.
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.
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);
}
'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
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) {
}
}
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);
# 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);
} 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.
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' ) {
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.
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 );
$template->param( else => 1 );
- default($message,$template);
- }
- else {
+ default( 'MESSAGE8', $template );
+ } else {
$template->param( delete_category => 1 );
$template->param( categorycode => $categorycode );
}
$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(
my $innertemplate = shift or return;
$innertemplate->param($message => 1) if $message;
$innertemplate->param(
- 'heading
-branches-
p' => 1,
+ 'heading
_branches_
p' => 1,
);
branchinfotable("",$innertemplate);
}
);
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
#
# 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 $catinfo = GetBranchCategory();
my @categoryloop = ();
foreach my $cat (@$catinfo) {
- my $checked
= ""
;
+ my $checked;
my $tmp = quotemeta( $cat->{'categorycode'} );
if ( grep { /^$tmp$/ } @{ $data->{'categories'} } ) {
my $tmp = quotemeta( $cat->{'categorycode'} );
if ( grep { /^$tmp$/ } @{ $data->{'categories'} } ) {
- $checked =
"checked=\"checked\""
;
+ $checked =
1
;
}
push @categoryloop, {
categoryname => $cat->{'categoryname'},
}
push @categoryloop, {
categoryname => $cat->{'categoryname'},
@@
-343,7
+341,7
@@
sub branchinfotable {
for my $field (
'branchaddress1', 'branchaddress2',
'branchaddress3', 'branchzip',
for my $field (
'branchaddress1', 'branchaddress2',
'branchaddress3', 'branchzip',
- 'branchcity', 'branchcountry',
+ 'branchcity', 'branch
state', 'branch
country',
'branchphone', 'branchfax',
'branchemail', 'branchurl',
'branchip', 'branchprinter', 'branchnotes'
'branchphone', 'branchfax',
'branchemail', 'branchurl',
'branchip', 'branchprinter', 'branchnotes'
@@
-383,7
+381,7
@@
sub branchinfotable {
categorytype => $cat->{'categorytype'},
};
}
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,
}
$innertemplate->param(
branches => \@loop_data,
@@
-402,6
+400,7
@@
sub _branch_to_template {
branchaddress3 => $data->{'branchaddress3'},
branchzip => $data->{'branchzip'},
branchcity => $data->{'branchcity'},
branchaddress3 => $data->{'branchaddress3'},
branchzip => $data->{'branchzip'},
branchcity => $data->{'branchcity'},
+ branchstate => $data->{'branchstate'},
branchcountry => $data->{'branchcountry'},
branchphone => $data->{'branchphone'},
branchfax => $data->{'branchfax'},
branchcountry => $data->{'branchcountry'},
branchphone => $data->{'branchphone'},
branchfax => $data->{'branchfax'},