X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fauthorised_values.pl;h=1545f0ea6101eb53b6a51791899e30f4932266b1;hb=81d5f9dcdae68037a43c7953be1e91a2fcf92b04;hp=9c85a0188a522a62d4ba90a6c671982054a73b7f;hpb=ff931f977ce8672e9edc598389787f6d818b00b2;p=koha.git diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index 9c85a0188a..1545f0ea61 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -13,9 +13,9 @@ # 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. use strict; use warnings; @@ -27,13 +27,13 @@ use C4::Koha; use C4::Output; -sub AuthorizedValuesForCategory ($) { +sub AuthorizedValuesForCategory { my ($searchstring) = shift or return; my $dbh = C4::Context->dbh; $searchstring=~ s/\'/\\\'/g; my @data=split(' ',$searchstring); my $sth=$dbh->prepare(' - SELECT id, category, authorised_value, lib, imageurl + SELECT id, category, authorised_value, lib, lib_opac, imageurl FROM authorised_values WHERE (category = ?) ORDER BY category, authorised_value @@ -44,14 +44,15 @@ sub AuthorizedValuesForCategory ($) { my $input = new CGI; my $id = $input->param('id'); -my $offset = $input->param('offset') || 0; -my $searchfield = $input->param('searchfield'); +my $op = $input->param('op') || ''; +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; +$searchfield =~ s/\,//g; +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}, @@ -59,8 +60,6 @@ my ($template, $borrowernumber, $cookie)= get_template_and_user({ type => "intranet", debug => 1, }); -my $pagesize = 20; -my $op = $input->param('op') || ''; $template->param( script_name => $script_name, ($op||'else') => 1 ); @@ -69,7 +68,7 @@ $template->param( script_name => $script_name, if ($op eq 'add_form') { my $data; if ($id) { - my $sth=$dbh->prepare("select id, category, authorised_value, lib, imageurl from authorised_values where 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; } else { @@ -77,18 +76,19 @@ if ($op eq 'add_form') { } if ($id) { $template->param(action_modify => 1); - $template->param('heading-modify-authorized-value-p' => 1); + $template->param('heading_modify_authorized_value_p' => 1); } elsif ( ! $data->{'category'} ) { $template->param(action_add_category => 1); - $template->param('heading-add-new-category-p' => 1); + $template->param('heading_add_new_category_p' => 1); } else { $template->param(action_add_value => 1); - $template->param('heading-add-authorized-value-p' => 1); + $template->param('heading_add_authorized_value_p' => 1); } - $template->param('use-heading-flags-p' => 1); + $template->param('use_heading_flags_p' => 1); $template->param( category => $data->{'category'}, authorised_value => $data->{'authorised_value'}, lib => $data->{'lib'}, + lib_opac => $data->{'lib_opac'}, id => $data->{'id'}, imagesets => C4::Koha::getImageSets( checked => $data->{'imageurl'} ), offset => $offset, @@ -104,42 +104,46 @@ if ($op eq 'add_form') { my $duplicate_entry = 0; 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 SET category = ?, authorised_value = ?, lib = ?, + lib_opac = ?, imageurl = ? WHERE id=?' ); 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 - $sth->execute($new_category, $new_authorised_value, $lib, $imageurl, $id); + 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); 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, imageurl ) - values (?, ?, ?, ?, ?)' ); + ( id, 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 - $sth->execute($id, $new_category, $new_authorised_value, $lib, $imageurl ); + 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 ); print "Content-Type: text/html\n\nparam('category')."&offset=$offset\">"; exit; } @@ -154,12 +158,13 @@ if ($op eq 'add_form') { ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB } elsif ($op eq 'delete_confirm') { - my $sth=$dbh->prepare("select category,authorised_value,lib from authorised_values where id=?"); + my $sth=$dbh->prepare("select category,authorised_value,lib,lib_opac from authorised_values where id=?"); $sth->execute($id); my $data=$sth->fetchrow_hashref; $id = $input->param('id') unless $id; $template->param(searchfield => $searchfield, Tlib => $data->{'lib'}, + Tlib_opac => $data->{'lib_opac'}, Tvalue => $data->{'authorised_value'}, id =>$id, ); @@ -213,35 +218,20 @@ sub default_form { my $count = scalar(@$results); my @loop_data = (); # builds value list - for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){ + for (my $i=0; $i < $count; $i++){ 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'}; - $row_data{lib} = $results->[$i]{'lib'}; - $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{category} = $results->[$i]{'category'}; + $row_data{authorised_value} = $results->[$i]{'authorised_value'}; + $row_data{lib} = $results->[$i]{'lib'}; + $row_data{lib_opac} = $results->[$i]{'lib_opac'}; + $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"; push(@loop_data, \%row_data); } $template->param( loop => \@loop_data, tab_list => $tab_list, category => $searchfield ); - - if ($offset>0) { - my $prevpage = $offset-$pagesize; - $template->param(isprevpage => $offset, - prevpage=> $prevpage, - searchfield => $searchfield, - script_name => $script_name, - ); - } - if ($offset+$pagesize<$count) { - my $nextpage =$offset+$pagesize; - $template->param(nextpage =>$nextpage, - searchfield => $searchfield, - script_name => $script_name, - ); - } }