# 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;
+
use CGI;
use C4::Auth;
use C4::Context;
use C4::Output;
-sub AuthorizedValuesForCategory {
- my ($searchstring,$type)=@_;
+sub AuthorizedValuesForCategory {
+ my ($searchstring) = shift or return;
my $dbh = C4::Context->dbh;
$searchstring=~ s/\'/\\\'/g;
my @data=split(' ',$searchstring);
- my $count=@data;
- my $sth=$dbh->prepare( 'Select id, category, authorised_value, lib, imageurl
- from authorised_values
- where (category = ?)
- order by category,authorised_value' );
+ my $sth=$dbh->prepare('
+ SELECT id, category, authorised_value, lib, lib_opac, imageurl
+ FROM authorised_values
+ WHERE (category = ?)
+ ORDER BY category, authorised_value
+ ');
$sth->execute("$data[0]");
- my @results;
- my $cnt=0;
- while (my $data=$sth->fetchrow_hashref){
- push(@results,$data);
- $cnt ++;
- }
- $sth->finish;
- return ($cnt,\@results);
+ return $sth->fetchall_arrayref({});
}
my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-$searchfield=~ s/\,//g;
-my $id = $input->param('id');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/authorised_values.pl";
-my $dbh = C4::Context->dbh;
+my $id = $input->param('id');
+my $op = $input->param('op') || '';
+our $offset = $input->param('offset') || 0;
+our $searchfield = $input->param('searchfield');
+$searchfield = '' unless defined $searchfield;
+$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({template_name => "admin/authorised_values.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => {parameters => 1},
- debug => 1,
- });
-my $pagesize=20;
-my $op = $input->param('op');
+our ($template, $borrowernumber, $cookie)= get_template_and_user({
+ template_name => "admin/authorised_values.tmpl",
+ authnotrequired => 0,
+ flagsrequired => {parameters => 'parameters_remaining_permissions'},
+ query => $input,
+ type => "intranet",
+ debug => 1,
+});
-if ($op) {
-$template->param(script_name => $script_name,
- $op => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
- else => 1); # we show only the TMPL_VAR names $op
-}
+$template->param( script_name => $script_name,
+ ($op||'else') => 1 );
################## ADD_FORM ##################################
# called by default. Used to create form to add or modify a record
if ($op eq 'add_form') {
my $data;
if ($id) {
- my $dbh = C4::Context->dbh;
- 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;
- $sth->finish;
} else {
$data->{'category'} = $input->param('category');
}
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'} )
+ imagesets => C4::Koha::getImageSets( checked => $data->{'imageurl'} ),
+ offset => $offset,
);
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
- my $dbh = C4::Context->dbh;
- my $new_category = $input->param('category');
my $new_authorised_value = $input->param('authorised_value');
- my $imageurl=$input->param( 'imageurl' )|'';
+ my $new_category = $input->param('category');
+ my $imageurl = $input->param( 'imageurl' ) || '';
+ $imageurl = '' if $imageurl =~ /removeImage/;
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();
- $sth->finish;
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);
- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$new_category."\"></html>";
+ 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<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$new_category."&offset=$offset\"></html>";
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();
- $sth->finish();
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 );
- $sth->finish;
- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."\"></html>";
+ 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\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."&offset=$offset\"></html>";
exit;
}
}
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
- my $dbh = C4::Context->dbh;
- 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;
- $sth->finish;
$id = $input->param('id') unless $id;
$template->param(searchfield => $searchfield,
Tlib => $data->{'lib'},
+ Tlib_opac => $data->{'lib_opac'},
Tvalue => $data->{'authorised_value'},
id =>$id,
);
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
} elsif ($op eq 'delete_confirmed') {
- my $dbh = C4::Context->dbh;
my $id = $input->param('id');
my $sth=$dbh->prepare("delete from authorised_values where id=?");
$sth->execute($id);
- $sth->finish;
- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=$searchfield\"></html>";
+ print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=$searchfield&offset=$offset\"></html>";
exit;
-
# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
exit 0;
sub default_form {
- # build categories list
- my $sth = $dbh->prepare("select distinct category from authorised_values");
- $sth->execute;
- # the list
- my @category_list;
- # a hash, to check that some hardcoded categories exist.
- my %categories;
- while ( my ($category) = $sth->fetchrow_array) {
- push(@category_list,$category);
- $categories{$category} = 1;
- }
- # push koha system categories
- push @category_list, 'Asort1' unless $categories{'Asort1'};
- push @category_list, 'Asort2' unless $categories{'Asort2'};
- push @category_list, 'Bsort1' unless $categories{'Bsort1'};
- push @category_list, 'Bsort2' unless $categories{'Bsort2'};
- push @category_list, 'SUGGEST' unless $categories{'SUGGEST'};
- push @category_list, 'DAMAGED' unless $categories{'DAMAGED'};
- push @category_list, 'LOST' unless $categories{'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)) {
+ push @category_list, $_ unless $categories{$_};
+ }
+
#reorder the list
@category_list = sort {$a cmp $b} @category_list;
my $tab_list = CGI::scrolling_list(-name=>'searchfield',
-values=> \@category_list,
-default=>"",
-size=>1,
- -tabindex=>'',
-multiple=>0,
);
if (!$searchfield) {
$searchfield=$category_list[0];
}
- my ($count,$results)=AuthorizedValuesForCategory($searchfield,'web');
- my $toggle=1;
+ my ($results) = AuthorizedValuesForCategory($searchfield);
+ my $count = scalar(@$results);
my @loop_data = ();
# builds value list
- for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
- if ($toggle eq 1){
- $toggle=1;
- } else {
- $toggle=0;
- }
+ 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} = getitemtypeimagesrc('intranet') . '/' . $results->[$i]{'imageurl'};
- $row_data{edit} = "$script_name?op=add_form&id=".$results->[$i]{'id'};
- $row_data{delete} = "$script_name?op=delete_confirm&searchfield=$searchfield&id=".$results->[$i]{'id'};
+ $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,
- );
- }
}
projects / koha.git / blobdiff