4d003ad9cd
When modifying an existing authorised value, the category is not correctly passed to the template and so it is not passed to the POST request, which results in the authorised value switching to category '', which effectively make it disappear from the interface. This patch fixes that. Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
247 lines
8.2 KiB
Perl
Executable file
247 lines
8.2 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY 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, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use List::MoreUtils qw(any);
|
|
|
|
use C4::Auth;
|
|
use C4::Context;
|
|
use C4::Koha;
|
|
use C4::Output;
|
|
|
|
use Koha::AuthorisedValues;
|
|
use Koha::AuthorisedValueCategories;
|
|
use Koha::Libraries;
|
|
|
|
my $input = new CGI;
|
|
my $id = $input->param('id');
|
|
my $op = $input->param('op') || 'list';
|
|
my $searchfield = $input->param('searchfield');
|
|
$searchfield = '' unless defined $searchfield;
|
|
$searchfield =~ s/\,//g;
|
|
my @messages;
|
|
|
|
our ($template, $borrowernumber, $cookie)= get_template_and_user({
|
|
template_name => "admin/authorised_values.tt",
|
|
authnotrequired => 0,
|
|
flagsrequired => {parameters => 'manage_auth_values'},
|
|
query => $input,
|
|
type => "intranet",
|
|
debug => 1,
|
|
});
|
|
|
|
################## ADD_FORM ##################################
|
|
# called by default. Used to create form to add or modify a record
|
|
if ($op eq 'add_form') {
|
|
my ( @selected_branches, $category, $av );
|
|
if ($id) {
|
|
$av = Koha::AuthorisedValues->new->find( $id );
|
|
@selected_branches = $av->library_limits ? $av->library_limits->as_list : ();
|
|
} else {
|
|
$category = $input->param('category');
|
|
}
|
|
|
|
my $branches = Koha::Libraries->search( {}, { order_by => ['branchname'] } );
|
|
my @branches_loop;
|
|
while ( my $branch = $branches->next ) {
|
|
push @branches_loop, {
|
|
branchcode => $branch->branchcode,
|
|
branchname => $branch->branchname,
|
|
selected => any {$_->branchcode eq $branch->branchcode} @selected_branches,
|
|
};
|
|
}
|
|
|
|
if ($id) {
|
|
$template->param(action_modify => 1);
|
|
} elsif ( ! $category ) {
|
|
$template->param(action_add_category => 1);
|
|
} else {
|
|
$template->param(action_add_value => 1);
|
|
}
|
|
|
|
if ( $av ) {
|
|
$template->param(
|
|
category_name => $av->category,
|
|
authorised_value => $av->authorised_value,
|
|
lib => $av->lib,
|
|
lib_opac => $av->lib_opac,
|
|
id => $av->id,
|
|
imagesets => C4::Koha::getImageSets( checked => $av->imageurl ),
|
|
);
|
|
} else {
|
|
$template->param(
|
|
category_name => $category,
|
|
imagesets => C4::Koha::getImageSets(),
|
|
);
|
|
}
|
|
$template->param(
|
|
branches_loop => \@branches_loop,
|
|
);
|
|
|
|
} elsif ($op eq 'add') {
|
|
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;
|
|
my @branches = grep { $_ ne q{} } $input->multi_param('branches');
|
|
|
|
if ( $new_category eq 'branches' or $new_category eq 'itemtypes' or $new_category eq 'cn_source' ) {
|
|
push @messages, {type => 'error', code => 'invalid_category_name' };
|
|
}
|
|
elsif ( $id ) { # Update
|
|
my $av = Koha::AuthorisedValues->new->find( $id );
|
|
|
|
$av->lib( scalar $input->param('lib') || undef );
|
|
$av->lib_opac( scalar $input->param('lib_opac') || undef );
|
|
$av->category( $new_category );
|
|
$av->authorised_value( $new_authorised_value );
|
|
$av->imageurl( $imageurl );
|
|
eval{
|
|
$av->store;
|
|
$av->replace_library_limits( \@branches );
|
|
};
|
|
if ( $@ ) {
|
|
push @messages, {type => 'error', code => 'error_on_update' };
|
|
} else {
|
|
push @messages, { type => 'message', code => 'success_on_update' };
|
|
}
|
|
}
|
|
else { # Insert
|
|
eval {
|
|
my $av = Koha::AuthorisedValue->new(
|
|
{
|
|
category => $new_category,
|
|
authorised_value => $new_authorised_value,
|
|
lib => scalar $input->param('lib') || undef,
|
|
lib_opac => scalar $input->param('lib_opac') || undef,
|
|
imageurl => $imageurl,
|
|
}
|
|
)->store;
|
|
$av->replace_library_limits( \@branches );
|
|
$av->store;
|
|
};
|
|
|
|
if ( $@ ) {
|
|
push @messages, {type => 'error', code => 'error_on_insert' };
|
|
} else {
|
|
push @messages, { type => 'message', code => 'success_on_insert' };
|
|
}
|
|
}
|
|
|
|
$op = 'list';
|
|
$searchfield = $new_category;
|
|
} elsif ($op eq 'add_category' ) {
|
|
my $new_category = $input->param('category');
|
|
|
|
my $already_exists = Koha::AuthorisedValueCategories->find(
|
|
{
|
|
category_name => $new_category,
|
|
}
|
|
);
|
|
|
|
if ( $already_exists ) {
|
|
if ( $new_category eq 'branches' or $new_category eq 'itemtypes' or $new_category eq 'cn_source' ) {
|
|
push @messages, {type => 'error', code => 'invalid_category_name' };
|
|
} else {
|
|
push @messages, {type => 'error', code => 'cat_already_exists' };
|
|
}
|
|
}
|
|
else { # Insert
|
|
my $av = Koha::AuthorisedValueCategory->new( {
|
|
category_name => $new_category,
|
|
} );
|
|
|
|
eval {
|
|
$av->store;
|
|
};
|
|
|
|
if ( $@ ) {
|
|
push @messages, {type => 'error', code => 'error_on_insert_cat' };
|
|
} else {
|
|
push @messages, { type => 'message', code => 'success_on_insert_cat' };
|
|
$searchfield = $new_category;
|
|
}
|
|
}
|
|
|
|
$op = 'list';
|
|
} elsif ($op eq 'delete') {
|
|
my $av = Koha::AuthorisedValues->new->find( $id );
|
|
my $deleted = eval {$av->delete};
|
|
if ( $@ or not $deleted ) {
|
|
push @messages, {type => 'error', code => 'error_on_delete' };
|
|
} else {
|
|
push @messages, { type => 'message', code => 'success_on_delete' };
|
|
}
|
|
|
|
$op = 'list';
|
|
} elsif ($op eq 'delete_category') {
|
|
my $category_name = $input->param('category_name');
|
|
my $avc = Koha::AuthorisedValueCategories->find( $category_name );
|
|
my $deleted = eval {$avc->delete};
|
|
if ( $@ or not $deleted ) {
|
|
push @messages, {type => 'error', code => 'error_on_delete_category' };
|
|
} else {
|
|
push @messages, { type => 'message', code => 'success_on_delete_category' };
|
|
}
|
|
|
|
$op = 'list';
|
|
}
|
|
|
|
$template->param(
|
|
op => $op,
|
|
searchfield => $searchfield,
|
|
messages => \@messages,
|
|
);
|
|
|
|
if ( $op eq 'list' ) {
|
|
# build categories list
|
|
my @categories = Koha::AuthorisedValueCategories->search({ category_name => { -not_in => ['', 'branches', 'itemtypes', 'cn_source']}}, { order_by => ['category_name'] } );
|
|
my @category_list;
|
|
for my $category ( @categories ) {
|
|
push( @category_list, $category->category_name );
|
|
}
|
|
|
|
$searchfield ||= $category_list[0];
|
|
|
|
my @avs_by_category = Koha::AuthorisedValues->new->search( { category => $searchfield } );
|
|
my @loop_data = ();
|
|
# builds value list
|
|
for my $av ( @avs_by_category ) {
|
|
my %row_data; # get a fresh hash for the row data
|
|
$row_data{category} = $av->category;
|
|
$row_data{authorised_value} = $av->authorised_value;
|
|
$row_data{lib} = $av->lib;
|
|
$row_data{lib_opac} = $av->lib_opac;
|
|
$row_data{imageurl} = getitemtypeimagelocation( 'intranet', $av->imageurl );
|
|
$row_data{branches} = $av->library_limits ? $av->library_limits->as_list : [];
|
|
$row_data{id} = $av->id;
|
|
push(@loop_data, \%row_data);
|
|
}
|
|
|
|
$template->param(
|
|
loop => \@loop_data,
|
|
category => Koha::AuthorisedValueCategories->find($searchfield), # TODO Move this up and add a Koha::AVC->authorised_values method to replace call for avs_by_category
|
|
categories => \@category_list,
|
|
);
|
|
|
|
}
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|