gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 22887: Rely on unique constraint in av admin 

Test plan:
Try to create 2 AV with the same code for the same category.
You should see a warning

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Lari Taskula <lari.taskula@hypernova.fi>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Jonathan Druart 2020-03-26 10:29:11 +01:00 committed by Martin Renvoize
parent 323e1a2a2f
commit d117a7d3ea
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
admin/authorised_values.pl
View File

@ -104,17 +104,7 @@ if ($op eq 'add_form') {
my $duplicate_entry = 0;
my @branches = grep { $_ ne q{} } $input->multi_param('branches');
my $already_exists = Koha::AuthorisedValues->search(
{
category => $new_category,
authorised_value => $new_authorised_value,
}
)->next;
if ( $already_exists and ( not $id or $already_exists->id != $id ) ) {
push @messages, {type => 'error', code => 'already_exists' };
}
elsif ( $new_category eq 'branches' or $new_category eq 'itemtypes' or $new_category eq 'cn_source' ) {
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
@ -136,17 +126,18 @@ if ($op eq 'add_form') {
}
}
else { # Insert
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,
} );
eval {
$av->store;
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 ( $@ ) {

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
View File

@ -177,8 +177,6 @@
Authorized value category added successfully.
[% CASE 'success_on_delete' %]
Authorized value deleted successfully.
[% CASE 'already_exists' %]
This authorized value already exists.
[% CASE 'cat_already_exists' %]
This authorized value category already exists.
[% CASE 'invalid_category_name' %]