# 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
Finlay working on this file from 26-03-2002
Reorganising this branches admin page.....
-
+
=cut
use strict;
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { parameters => 1},
+ flagsrequired => { parameters => 'parameters_remaining_permissions'},
debug => 1,
}
);
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.
- $template->param( 'heading-branches-add-branch-p' => 0,
+ $template->param( 'heading_branches_add_branch_p' => 0,
'add' => 1, );
editbranchform($branchcode,$template);
}
default("MESSAGE1",$template);
}
else {
- my $error = ModBranch($params); # FIXME: causes warnings to log on duplicate branchcode
- # if error saving, stay on edit and rise error
- if ($error) {
- # copy input parameters back to form
- # FIXME - doing this doesn't preserve any branch group selections, but good enough for now
- $template->param(%$params); # FIXME: Allows user to set ANY TMPL_VAR to ANY value!!
- $template->param(branch_name => $params->{branchname});
- $template->param( 'heading-branches-add-branch-p' => 1, 'add' => 1, "ERROR$error" => 1 );
- } else {
- $template->param( else => 1);
- default("MESSAGE2",$template);
+ my $mod_branch = 1;
+ if ($params->{add}) {
+ my ($existing) =
+ C4::Context->dbh->selectrow_array("SELECT count(*) FROM branches WHERE branchcode = ?", {}, $branchcode);
+ 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 );
+ }
+ }
+ if ($mod_branch) {
+ my $error = ModBranch($params); # FIXME: causes warnings to log on duplicate branchcode
+ # if error saving, stay on edit and rise error
+ if ($error) {
+ # 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 );
+ } else {
+ $template->param( else => 1);
+ default("MESSAGE2",$template);
+ }
}
}
}
# check to see if the branchcode is being used in the database somewhere....
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare("select count(*) from items where holdingbranch=? or homebranch=?");
- $sth->execute( $branchcode, $branchcode );
- my ($total) = $sth->fetchrow_array;
- if ($total) {
+ my $sthitems = $dbh->prepare("select count(*) from items where holdingbranch=? or homebranch=?");
+ my $sthborrowers = $dbh->prepare("select count(*) from borrowers where branchcode=?");
+ $sthitems->execute( $branchcode, $branchcode );
+ $sthborrowers->execute( $branchcode );
+ my ($totalitems) = $sthitems->fetchrow_array;
+ 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);
}
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' ) {
unless ( $params->{'categorycode'} && $params->{'categoryname'} ) {
default("MESSAGE4",$template);
}
+ elsif ($input->param('add')){
+ # doing an add must check the code is unique
+ if (CheckCategoryUnique($input->param('categorycode'))){
+ ModBranchCategoryInfo($params);
+ default("MESSAGE5",$template);
+ }
+ else {
+ default("MESSAGE9",$template);
+ }
+ }
else {
ModBranchCategoryInfo($params);
default("MESSAGE5",$template);
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 );
- default($message,$template);
- }
- else {
+ default( 'MESSAGE8', $template );
+ } else {
$template->param( delete_category => 1 );
$template->param( categorycode => $categorycode );
}
my $innertemplate = shift or return;
$innertemplate->param($message => 1) if $message;
$innertemplate->param(
- 'heading-branches-p' => 1,
+ 'heading_branches_p' => 1,
);
branchinfotable("",$innertemplate);
}
# get the old printer of the branch
$oldprinter = $data->{'branchprinter'} || '';
- $innertemplate->param(
- branchcode => $data->{'branchcode'},
- branch_name => $data->{'branchname'},
- branchaddress1 => $data->{'branchaddress1'},
- branchaddress2 => $data->{'branchaddress2'},
- branchaddress3 => $data->{'branchaddress3'},
- branchzip => $data->{'branchzip'},
- branchcity => $data->{'branchcity'},
- branchcountry => $data->{'branchcountry'},
- branchphone => $data->{'branchphone'},
- branchfax => $data->{'branchfax'},
- branchemail => $data->{'branchemail'},
- branchurl => $data->{'branchurl'},
- branchip => $data->{'branchip'},
- branchnotes => $data->{'branchnotes'},
- );
+ _branch_to_template($data, $innertemplate);
}
foreach my $thisprinter ( keys %$printers ) {
#
# 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'},
# - 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")
for my $field (
'branchaddress1', 'branchaddress2',
'branchaddress3', 'branchzip',
- 'branchcity', 'branchcountry',
+ 'branchcity', 'branchstate', 'branchcountry',
'branchphone', 'branchfax',
- 'branchemail', 'branchurl',
+ 'branchemail', 'branchurl', 'opac_info',
'branchip', 'branchprinter', 'branchnotes'
)
{
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,
}
+sub _branch_to_template {
+ my ($data, $template) = @_;
+ $template->param(
+ branchcode => $data->{'branchcode'},
+ branch_name => $data->{'branchname'},
+ branchaddress1 => $data->{'branchaddress1'},
+ branchaddress2 => $data->{'branchaddress2'},
+ branchaddress3 => $data->{'branchaddress3'},
+ branchzip => $data->{'branchzip'},
+ branchcity => $data->{'branchcity'},
+ branchstate => $data->{'branchstate'},
+ branchcountry => $data->{'branchcountry'},
+ branchphone => $data->{'branchphone'},
+ branchfax => $data->{'branchfax'},
+ branchemail => $data->{'branchemail'},
+ branchurl => $data->{'branchurl'},
+ opac_info => $data->{'opac_info'},
+ branchip => $data->{'branchip'},
+ branchnotes => $data->{'branchnotes'},
+ );
+}
+
output_html_with_http_headers $input, $cookie, $template->output;
# Local Variables:
projects / koha.git / blobdiff