X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fauthorised_values.pl;h=d7872d649aa7e06eacfc4e9921c12084c5aa8d40;hb=9a168e7c9451e1960dadbecf83ba937851840310;hp=16f9fff4e47546be80c5c0b711a49658609009c0;hpb=4ed42893e8a11946707bfc574a768284926edca4;p=koha.git
diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index 16f9fff4e4..d7872d649a 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -13,119 +13,159 @@
# 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::Koha;
use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-use HTML::Template;
-use C4::Context;
-sub StringSearch {
- my ($env,$searchstring,$type)=@_;
- my $dbh = C4::Context->dbh;
- $searchstring=~ s/\'/\\\'/g;
- my @data=split(' ',$searchstring);
- my $count=@data;
- my $query="Select id,category,authorised_value,lib from authorised_values where (category like \"$data[0]%\") order by category,authorised_value";
- my $sth=$dbh->prepare($query);
- $sth->execute;
- my @results;
- my $cnt=0;
- while (my $data=$sth->fetchrow_hashref){
- push(@results,$data);
- $cnt ++;
- }
- $sth->finish;
- return ($cnt,\@results);
+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, lib_opac, imageurl
+ FROM authorised_values
+ WHERE (category = ?)
+ ORDER BY category, authorised_value
+ ');
+ $sth->execute("$data[0]");
+ return $sth->fetchall_arrayref({});
}
my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-$searchfield=~ s/\,//g;
-my $id = $input->param('id');
-my $reqsel="select category,authorised_value,lib from authorised_values where id='$id'";
-my $reqdel="delete from authorised_values where id='$id'";
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/authorised_values.pl";
+my $id = $input->param('id');
+my $op = $input->param('op') || '';
+my $offset = $input->param('offset') || 0;
+my $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;
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "parameters/authorised_values.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => {parameters => 1},
- debug => 1,
- });
-my $pagesize=20;
-my $op = $input->param('op');
+my ($template, $borrowernumber, $cookie)= get_template_and_user({
+ template_name => "admin/authorised_values.tmpl",
+ authnotrequired => 0,
+ flagsrequired => {parameters => 1},
+ 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 from authorised_values where id='$id'");
- $sth->execute;
+ 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 ($searchfield) {
- $template->param(action => "Modify authorised value");
+ if ($id) {
+ $template->param(action_modify => 1);
+ $template->param('heading_modify_authorized_value_p' => 1);
} elsif ( ! $data->{'category'} ) {
- $template->param(action => "Add new category");
- } else {
- $template->param(action => "Add authorised value");
- }
- $template->param(category => $data->{'category'},
- authorised_value => $data->{'authorised_value'},
- lib => $data->{'lib'},
- id => $data->{'id'}
- );
- if ($data->{'category'}) {
- $template->param(category => "$data->{'category'}");
+ $template->param(action_add_category => 1);
+ $template->param('heading_add_new_category_p' => 1);
} else {
- $template->param(category => "");
+ $template->param(action_add_value => 1);
+ $template->param('heading_add_authorized_value_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,
+ );
+
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
- my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("replace authorised_values (id,category,authorised_value,lib) values (?,?,?,?)");
- my $lib = $input->param('lib');
- undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
+ my $new_authorised_value = $input->param('authorised_value');
+ 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 ($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();
+ ($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
+ 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