# TMPL_LOOP'ized; doing this properly will fix bug 130; need to
# notify translators
# FIXME: need to implement the branch categories stuff
-# FIXME: heading() need to be moved to templates, need to notify translators
# FIXME: there are too many TMPL_IF's; the proper way to do it is to have
# separate templates for each individual action; need to notify
# translators
# FIXME: there are lots of error messages exported to the template; a lot
# of these should be converted into exported booleans / counters etc
# so that the error messages can be localized; need to notify translators
+#
+# NOTE: heading() should now be called like this:
+# 1. Use heading() as before
+# 2. $template->param('heading-LISPISHIZED-HEADING-p' => 1);
+# 3. $template->param('use-heading-flags-p' => 1);
+# This ensures that both converted and unconverted templates work
# Finlay working on this file from 26-03-2002
# Reorganising this branches admin page.....
else => 1); # we show only the TMPL_VAR names $op
}
$template->param(action => $script_name);
-
if ($op eq 'add') {
# If the user has pressed the "add new branch" button.
heading("Branches: Add Branch");
+ $template->param('heading-branches-add-branch-p' => 1);
+ $template->param('use-heading-flags-p' => 1);
editbranchform();
} elsif ($op eq 'edit') {
# if the user has pressed the "edit branch settings" button.
heading("Branches: Edit Branch");
+ $template->param('heading-branches-edit-branch-p' => 1);
+ $template->param('use-heading-flags-p' => 1);
$template->param(add => 1);
editbranchform($branchcode);
} elsif ($op eq 'add_validate') {
$template->param(else => 1);
default("The branch with code $branchcode has been deleted.");
} elsif ($op eq 'editcategory') {
- # If the user has pressed the "add new category" button.
+ # If the user has pressed the "add new category" or "modify" buttons.
heading("Branches: Edit Category");
+ $template->param('heading-branches-edit-category-p' => 1);
+ $template->param('use-heading-flags-p' => 1);
editcatform($categorycode);
} elsif ($op eq 'addcategory_validate') {
# confirm settings change...
sub default {
my ($message) = @_;
heading("Branches");
+ $template->param('heading-branches-p' => 1);
+ $template->param('use-heading-flags-p' => 1);
$template->param(message => $message);
$template->param(action => $script_name);
branchinfotable();
my ($branchcode) = @_;
my $dbh = C4::Context->dbh;
- my ($query, @query_args);
+ my $sth;
if ($branchcode) {
- $query = "Select * from branches where branchcode = ?";
- @query_args = ($branchcode);
+ $sth = $dbh->prepare("Select * from branches where branchcode = ? order by branchcode");
+ $sth->execute($branchcode);
} else {
- $query = "Select * from branches";
+ $sth = $dbh->prepare("Select * from branches order by branchcode");
+ $sth->execute();
}
- $query.=" order by branchcode";
- my $sth = $dbh->prepare($query);
- $sth->execute(@query_args);
my @results;
while (my $data = $sth->fetchrow_hashref) {
- $query = "select categorycode from branchrelations where branchcode = ?";
- my $nsth = $dbh->prepare($query);
+ my $nsth = $dbh->prepare("select categorycode from branchrelations where branchcode = ?");
$nsth->execute($data->{'branchcode'});;
my @cats = ();
while (my ($cat) = $nsth->fetchrow_array) {
# returns a reference to an array of hashes containing branches,
my ($catcode) = @_;
my $dbh = C4::Context->dbh;
- my ($query, @query_args);
+ my $sth;
# print DEBUG "getcategoryinfo: entry: catcode=".cvs($catcode)."\n";
if ($catcode) {
- $query = "select * from branchcategories where categorycode = ?";
- @query_args = ($catcode);
+ $sth = $dbh->prepare("select * from branchcategories where categorycode = ?");
+ $sth->execute($catcode);
} else {
- $query = "Select * from branchcategories";
+ $sth = $dbh->prepare("Select * from branchcategories");
+ $sth->execute();
}
- # print DEBUG "getcategoryinfo: query=".cvs($query)."\n";
- my $sth = $dbh->prepare($query);
- $sth->execute(@query_args);
my @results;
while (my $data = $sth->fetchrow_hashref) {
push(@results, $data);
# sets the data from the editbranch form, and writes to the database...
my ($data) = @_;
my $dbh = C4::Context->dbh;
- my $query = "replace branches (branchcode,branchname,branchaddress1,branchaddress2,branchaddress3,branchphone,branchfax,branchemail) values (?,?,?,?,?,?,?,?)";
- my $sth=$dbh->prepare($query);
+ my $sth=$dbh->prepare("replace branches (branchcode,branchname,branchaddress1,branchaddress2,branchaddress3,branchphone,branchfax,branchemail) values (?,?,?,?,?,?,?,?)");
$sth->execute(uc($data->{'branchcode'}), $data->{'branchname'},
$data->{'branchaddress1'}, $data->{'branchaddress2'},
$data->{'branchaddress3'}, $data->{'branchphone'},
push(@addcats, $ccat);
}
}
- # FIXME - There's already a $dbh in this scope.
- my $dbh = C4::Context->dbh;
foreach my $cat (@addcats) {
- my $query = "insert into branchrelations (branchcode, categorycode) values(?, ?)";
- my $sth = $dbh->prepare($query);
+ my $sth = $dbh->prepare("insert into branchrelations (branchcode, categorycode) values(?, ?)");
$sth->execute($branchcode, $cat);
$sth->finish;
}
foreach my $cat (@removecats) {
- my $query = "delete from branchrelations where branchcode=? and categorycode=?";
- my $sth = $dbh->prepare($query);
+ my $sth = $dbh->prepare("delete from branchrelations where branchcode=? and categorycode=?");
$sth->execute($branchcode, $cat);
$sth->finish;
}
sub deletebranch {
# delete branch...
my ($branchcode) = @_;
- my $query = "delete from branches where branchcode = ?";
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare($query);
+ my $sth=$dbh->prepare("delete from branches where branchcode = ?");
$sth->execute($branchcode);
$sth->finish;
}
# sets the data from the editbranch form, and writes to the database...
my ($data) = @_;
my $dbh = C4::Context->dbh;
- my $query = "replace branchcategories (categorycode,categoryname,codedescription) values (?,?,?)";
- my $sth=$dbh->prepare($query);
+ my $sth=$dbh->prepare("replace branchcategories (categorycode,categoryname,codedescription) values (?,?,?)");
$sth->execute(uc($data->{'categorycode'}), $data->{'categoryname'},$data->{'codedescription'});
$sth->finish;
sub deletecategory {
# delete branch...
my ($categorycode) = @_;
- my $query = "delete from branchcategories where categorycode = ?";
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare($query);
+ my $sth=$dbh->prepare("delete from branchcategories where categorycode = ?");
$sth->execute($categorycode);
$sth->finish;
}
projects / koha_gimpoz / blobdiff