Browse Source

Bug 10363: FIX regression - prevent duplicate

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
3.22.x
Jonathan Druart 7 years ago
committed by Tomas Cohen Arazi
parent
commit
4b2b06311e
  1. 6
      Koha/AuthorisedValues.pm
  2. 12
      admin/authorised_values.pl
  3. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt

6
Koha/AuthorisedValues.pm

@ -59,11 +59,7 @@ sub search {
}
: {};
my $join = $branchcode ? { join => 'authorised_values_branches' } : {};
my $rs = $self->_resultset()
->search( { %$params, %$or, }, $join );
my $class = ref($self);
return wantarray ? $self->_wrap( $rs->all() ) : $class->_new_from_dbic($rs);
return $self->SUPER::search( { %$params, %$or, }, $join );
}
sub categories {

12
admin/authorised_values.pl

@ -103,7 +103,17 @@ if ($op eq 'add_form') {
my $duplicate_entry = 0;
my @branches = grep { $_ ne q{} } $input->param('branches');
if ( $id ) { # Update
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 ( $id ) { # Update
my $av = Koha::AuthorisedValues->new->find( $id );
$av->lib( $input->param('lib') || undef );

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

@ -184,6 +184,8 @@ $(document).ready(function() {
Authorized value inserted successfully.
[% CASE 'success_on_delete' %]
Authorized value deleted successfully.
[% CASE 'already_exists' %]
This authorized value already exists.
[% CASE %]
[% m.code %]
[% END %]

Loading…
Cancel
Save