X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fauthorised_values.pl;h=332f09a39910ae4c99b9d25194fb816729b33a11;hb=568f32606c2c9c247b2b477193a2d6814f738fa6;hp=c26f3a9ec5cb4b50bfe4827249796b2664ea8f25;hpb=2c470899b3f0191b9597d713e895b9240fe1d137;p=koha.git diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index c26f3a9ec5..332f09a399 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -22,12 +22,13 @@ use warnings; use CGI; use C4::Auth; +use C4::Branch; use C4::Context; use C4::Koha; use C4::Output; -sub AuthorizedValuesForCategory ($) { +sub AuthorizedValuesForCategory { my ($searchstring) = shift or return; my $dbh = C4::Context->dbh; $searchstring=~ s/\'/\\\'/g; @@ -45,17 +46,17 @@ sub AuthorizedValuesForCategory ($) { my $input = new CGI; my $id = $input->param('id'); my $op = $input->param('op') || ''; -my $offset = $input->param('offset') || 0; -my $searchfield = $input->param('searchfield'); +our $offset = $input->param('offset') || 0; +our $searchfield = $input->param('searchfield'); $searchfield = '' unless defined $searchfield; $searchfield =~ s/\,//g; -my $script_name = "/cgi-bin/koha/admin/authorised_values.pl"; -my $dbh = C4::Context->dbh; +our $script_name = "/cgi-bin/koha/admin/authorised_values.pl"; +our $dbh = C4::Context->dbh; -my ($template, $borrowernumber, $cookie)= get_template_and_user({ +our ($template, $borrowernumber, $cookie)= get_template_and_user({ template_name => "admin/authorised_values.tmpl", authnotrequired => 0, - flagsrequired => {parameters => 1}, + flagsrequired => {parameters => 'parameters_remaining_permissions'}, query => $input, type => "intranet", debug => 1, @@ -67,13 +68,32 @@ $template->param( script_name => $script_name, # called by default. Used to create form to add or modify a record if ($op eq 'add_form') { my $data; + my @selected_branches; if ($id) { my $sth=$dbh->prepare("select id, category, authorised_value, lib, lib_opac, imageurl from authorised_values where id=?"); $sth->execute($id); $data=$sth->fetchrow_hashref; + $sth = $dbh->prepare("SELECT b.branchcode, b.branchname FROM authorised_values_branches AS avb, branches AS b WHERE avb.branchcode = b.branchcode AND avb.av_id = ?;"); + $sth->execute( $id ); + while ( my $branch = $sth->fetchrow_hashref ) { + push @selected_branches, $branch; + } } else { $data->{'category'} = $input->param('category'); } + + my $branches = GetBranches; + my @branches_loop; + + foreach my $branch (sort keys %$branches) { + my $selected = ( grep {$_->{branchcode} eq $branch} @selected_branches ) ? 1 : 0; + push @branches_loop, { + branchcode => $branches->{$branch}{branchcode}, + branchname => $branches->{$branch}{branchname}, + selected => $selected, + }; + } + if ($id) { $template->param(action_modify => 1); $template->param('heading_modify_authorized_value_p' => 1); @@ -92,6 +112,7 @@ if ($op eq 'add_form') { id => $data->{'id'}, imagesets => C4::Koha::getImageSets( checked => $data->{'imageurl'} ), offset => $offset, + branches_loop => \@branches_loop, ); ################## ADD_VALIDATE ################################## @@ -102,17 +123,17 @@ if ($op eq 'add_form') { my $imageurl = $input->param( 'imageurl' ) || ''; $imageurl = '' if $imageurl =~ /removeImage/; my $duplicate_entry = 0; + my @branches = $input->param('branches'); if ( $id ) { # Update - my $sth = $dbh->prepare( "SELECT category, authorised_value FROM authorised_values WHERE id='$id' "); - $sth->execute(); + my $sth = $dbh->prepare( "SELECT category, authorised_value FROM authorised_values WHERE id = ? "); + $sth->execute($id); my ($category, $authorised_value) = $sth->fetchrow_array(); if ( $authorised_value ne $new_authorised_value ) { my $sth = $dbh->prepare_cached( "SELECT COUNT(*) FROM authorised_values " . - "WHERE category = '$new_category' AND authorised_value = '$new_authorised_value' and id<>$id"); - $sth->execute(); + "WHERE category = ? AND authorised_value = ? and id <> ? "); + $sth->execute($new_category, $new_authorised_value, $id); ($duplicate_entry) = $sth->fetchrow_array(); - warn "**** duplicate_entry = $duplicate_entry"; } unless ( $duplicate_entry ) { my $sth=$dbh->prepare( 'UPDATE authorised_values @@ -126,25 +147,51 @@ if ($op eq 'add_form') { my $lib_opac = $input->param('lib_opac'); undef $lib if ($lib eq ""); # to insert NULL instead of a blank string undef $lib_opac if ($lib_opac eq ""); # to insert NULL instead of a blank string - $sth->execute($new_category, $new_authorised_value, $lib, $lib_opac, $imageurl, $id); + $sth->execute($new_category, $new_authorised_value, $lib, $lib_opac, $imageurl, $id); + if ( @branches ) { + $sth = $dbh->prepare("DELETE FROM authorised_values_branches WHERE av_id = ?"); + $sth->execute( $id ); + $sth = $dbh->prepare( + "INSERT INTO authorised_values_branches + ( av_id, branchcode ) + VALUES ( ?, ? )" + ); + for my $branchcode ( @branches ) { + next if not $branchcode; + $sth->execute($id, $branchcode); + } + } + $sth->finish; print "Content-Type: text/html\n\n"; exit; } } else { # Insert my $sth = $dbh->prepare_cached( "SELECT COUNT(*) FROM authorised_values " . - "WHERE category = '$new_category' AND authorised_value = '$new_authorised_value' "); - $sth->execute(); + "WHERE category = ? AND authorised_value = ? "); + $sth->execute($new_category, $new_authorised_value); ($duplicate_entry) = $sth->fetchrow_array(); unless ( $duplicate_entry ) { my $sth=$dbh->prepare( 'INSERT INTO authorised_values - ( id, category, authorised_value, lib, lib_opac, imageurl ) - values (?, ?, ?, ?, ?, ?)' ); + ( category, authorised_value, lib, lib_opac, imageurl ) + values (?, ?, ?, ?, ?)' ); my $lib = $input->param('lib'); my $lib_opac = $input->param('lib_opac'); undef $lib if ($lib eq ""); # to insert NULL instead of a blank string undef $lib_opac if ($lib_opac eq ""); # to insert NULL instead of a blank string - $sth->execute($id, $new_category, $new_authorised_value, $lib, $lib_opac, $imageurl ); + $sth->execute( $new_category, $new_authorised_value, $lib, $lib_opac, $imageurl ); + $id = $dbh->{'mysql_insertid'}; + if ( @branches ) { + $sth = $dbh->prepare( + "INSERT INTO authorised_values_branches + ( av_id, branchcode ) + VALUES ( ?, ? )" + ); + for my $branchcode ( @branches ) { + next if not $branchcode; + $sth->execute($id, $branchcode); + } + } print "Content-Type: text/html\n\nparam('category')."&offset=$offset\">"; exit; } @@ -189,17 +236,18 @@ output_html_with_http_headers $input, $cookie, $template->output; exit 0; sub default_form { - # build categories list - my $sth = $dbh->prepare("select distinct category from authorised_values"); - $sth->execute; - my @category_list; - my %categories; # a hash, to check that some hardcoded categories exist. - while ( my ($category) = $sth->fetchrow_array) { - push(@category_list,$category); - $categories{$category} = 1; - } - # push koha system categories - foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST)) { + # build categories list + my $sth = $dbh->prepare("select distinct category from authorised_values"); + $sth->execute; + my @category_list; + my %categories; # a hash, to check that some hardcoded categories exist. + while ( my ($category) = $sth->fetchrow_array ) { + push( @category_list, $category ); + $categories{$category} = 1; + } + + # push koha system categories + foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP DEPARTMENT TERM SUGGEST_STATUS)) { push @category_list, $_ unless $categories{$_}; } @@ -219,7 +267,14 @@ sub default_form { my $count = scalar(@$results); my @loop_data = (); # builds value list + my $dbh = C4::Context->dbh; + $sth = $dbh->prepare("SELECT b.branchcode, b.branchname FROM authorised_values_branches AS avb, branches AS b WHERE avb.branchcode = b.branchcode AND avb.av_id = ?"); for (my $i=0; $i < $count; $i++){ + $sth->execute( $results->[$i]{id} ); + my @selected_branches; + while ( my $branch = $sth->fetchrow_hashref ) { + push @selected_branches, $branch; + } my %row_data; # get a fresh hash for the row data $row_data{category} = $results->[$i]{'category'}; $row_data{authorised_value} = $results->[$i]{'authorised_value'}; @@ -228,6 +283,7 @@ sub default_form { $row_data{imageurl} = getitemtypeimagelocation( 'intranet', $results->[$i]{'imageurl'} ); $row_data{edit} = "$script_name?op=add_form&id=".$results->[$i]{'id'}."&offset=$offset"; $row_data{delete} = "$script_name?op=delete_confirm&searchfield=$searchfield&id=".$results->[$i]{'id'}."&offset=$offset"; + $row_data{branches} = \@selected_branches; push(@loop_data, \%row_data); }