projects
/
srvgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 32336: Add unit test for UNIMARC encoding problems in REST API
[srvgit]
/
admin
/
itemtypes.pl
diff --git
a/admin/itemtypes.pl
b/admin/itemtypes.pl
index
3381e21
..
44e9ad5
100755
(executable)
--- a/
admin/itemtypes.pl
+++ b/
admin/itemtypes.pl
@@
-25,17
+25,16
@@
use Modern::Perl;
use CGI qw ( -utf8 );
use Modern::Perl;
use CGI qw ( -utf8 );
-use File::Spec;
-use C4::Koha;
+use C4::Koha
qw( getImageSets GetAuthorisedValues )
;
use C4::Context;
use C4::Context;
-use C4::Auth;
-use C4::Output;
+use C4::Auth
qw( get_template_and_user )
;
+use C4::Output
qw( output_html_with_http_headers )
;
use Koha::ItemTypes;
use Koha::ItemType;
use Koha::Localizations;
use Koha::ItemTypes;
use Koha::ItemType;
use Koha::Localizations;
-my $input =
new CGI
;
+my $input =
CGI->new
;
my $searchfield = $input->param('description');
my $itemtype_code = $input->param('itemtype');
my $op = $input->param('op') // 'list';
my $searchfield = $input->param('description');
my $itemtype_code = $input->param('itemtype');
my $op = $input->param('op') // 'list';
@@
-45,9
+44,7
@@
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{ template_name => "admin/itemtypes.tt",
query => $input,
type => "intranet",
{ template_name => "admin/itemtypes.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { parameters => 'manage_itemtypes' },
flagsrequired => { parameters => 'manage_itemtypes' },
- debug => 1,
}
);
}
);
@@
-58,11
+55,17
@@
undef($sip_media_type) if defined($sip_media_type) and $sip_media_type =~ /^\s*$
if ( $op eq 'add_form' ) {
my $itemtype = Koha::ItemTypes->find($itemtype_code);
if ( $op eq 'add_form' ) {
my $itemtype = Koha::ItemTypes->find($itemtype_code);
+
+ my $parent_type = $itemtype ? $itemtype->parent_type : undef;
+ my $parent_types = Koha::ItemTypes->search({parent_type=>undef,itemtype => {'!='=>$itemtype_code}});
my $imagesets = C4::Koha::getImageSets( checked => ( $itemtype ? $itemtype->imageurl : undef ) );
my $searchcategory = GetAuthorisedValues("ITEMTYPECAT");
my $imagesets = C4::Koha::getImageSets( checked => ( $itemtype ? $itemtype->imageurl : undef ) );
my $searchcategory = GetAuthorisedValues("ITEMTYPECAT");
- my $translated_languages = C4::Languages::getTranslatedLanguages(
undef
, C4::Context->preference('template') );
+ my $translated_languages = C4::Languages::getTranslatedLanguages(
"both"
, C4::Context->preference('template') );
$template->param(
itemtype => $itemtype,
$template->param(
itemtype => $itemtype,
+ parent_type => $parent_type,
+ parent_types => $parent_types,
+ is_a_parent => $itemtype ? Koha::ItemTypes->search({parent_type=>$itemtype_code})->count : 0,
imagesets => $imagesets,
searchcategory => $searchcategory,
can_be_translated => ( scalar(@$translated_languages) > 1 ? 1 : 0 ),
imagesets => $imagesets,
searchcategory => $searchcategory,
can_be_translated => ( scalar(@$translated_languages) > 1 ? 1 : 0 ),
@@
-70,12
+73,15
@@
if ( $op eq 'add_form' ) {
} elsif ( $op eq 'add_validate' ) {
my $is_a_modif = $input->param('is_a_modif');
my $itemtype = Koha::ItemTypes->find($itemtype_code);
} elsif ( $op eq 'add_validate' ) {
my $is_a_modif = $input->param('is_a_modif');
my $itemtype = Koha::ItemTypes->find($itemtype_code);
+ my $parent_type = $input->param('parent_type') || undef;
my $description = $input->param('description');
my $rentalcharge = $input->param('rentalcharge');
my $rentalcharge_daily = $input->param('rentalcharge_daily');
my $description = $input->param('description');
my $rentalcharge = $input->param('rentalcharge');
my $rentalcharge_daily = $input->param('rentalcharge_daily');
+ my $rentalcharge_hourly = $input->param('rentalcharge_hourly');
my $defaultreplacecost = $input->param('defaultreplacecost');
my $processfee = $input->param('processfee');
my $image = $input->param('image') || q||;
my $defaultreplacecost = $input->param('defaultreplacecost');
my $processfee = $input->param('processfee');
my $image = $input->param('image') || q||;
+ my @branches = grep { $_ ne q{} } $input->multi_param('branches');
my $notforloan = $input->param('notforloan') ? 1 : 0;
my $imageurl =
my $notforloan = $input->param('notforloan') ? 1 : 0;
my $imageurl =
@@
-89,11
+95,16
@@
if ( $op eq 'add_form' ) {
my $checkinmsgtype = $input->param('checkinmsgtype');
my $hideinopac = $input->param('hideinopac') // 0;
my $searchcategory = $input->param('searchcategory');
my $checkinmsgtype = $input->param('checkinmsgtype');
my $hideinopac = $input->param('hideinopac') // 0;
my $searchcategory = $input->param('searchcategory');
+ my $rentalcharge_daily_calendar = $input->param('rentalcharge_daily_calendar') // 0;
+ my $rentalcharge_hourly_calendar = $input->param('rentalcharge_hourly_calendar') // 0;
+ my $automatic_checkin = $input->param('automatic_checkin') // 0;
if ( $itemtype and $is_a_modif ) { # it's a modification
$itemtype->description($description);
if ( $itemtype and $is_a_modif ) { # it's a modification
$itemtype->description($description);
+ $itemtype->parent_type($parent_type);
$itemtype->rentalcharge($rentalcharge);
$itemtype->rentalcharge_daily($rentalcharge_daily);
$itemtype->rentalcharge($rentalcharge);
$itemtype->rentalcharge_daily($rentalcharge_daily);
+ $itemtype->rentalcharge_hourly($rentalcharge_hourly);
$itemtype->defaultreplacecost($defaultreplacecost);
$itemtype->processfee($processfee);
$itemtype->notforloan($notforloan);
$itemtype->defaultreplacecost($defaultreplacecost);
$itemtype->processfee($processfee);
$itemtype->notforloan($notforloan);
@@
-104,11
+115,17
@@
if ( $op eq 'add_form' ) {
$itemtype->sip_media_type($sip_media_type);
$itemtype->hideinopac($hideinopac);
$itemtype->searchcategory($searchcategory);
$itemtype->sip_media_type($sip_media_type);
$itemtype->hideinopac($hideinopac);
$itemtype->searchcategory($searchcategory);
+ $itemtype->rentalcharge_daily_calendar($rentalcharge_daily_calendar);
+ $itemtype->rentalcharge_hourly_calendar($rentalcharge_hourly_calendar);
+ $itemtype->automatic_checkin($automatic_checkin);
- eval { $itemtype->store; };
+ eval {
+ $itemtype->store;
+ $itemtype->replace_library_limits( \@branches );
+ };
if ($@) {
if ($@) {
- push @messages, { type => '
error
', code => 'error_on_update' };
+ push @messages, { type => '
alert
', code => 'error_on_update' };
} else {
push @messages, { type => 'message', code => 'success_on_update' };
}
} else {
push @messages, { type => 'message', code => 'success_on_update' };
}
@@
-117,8
+134,10
@@
if ( $op eq 'add_form' ) {
{
itemtype => $itemtype_code,
description => $description,
{
itemtype => $itemtype_code,
description => $description,
+ parent_type => $parent_type,
rentalcharge => $rentalcharge,
rentalcharge => $rentalcharge,
- rentalcharge_daily => $rentalcharge_daily,
+ rentalcharge_daily => $rentalcharge_daily,
+ rentalcharge_hourly => $rentalcharge_hourly,
defaultreplacecost => $defaultreplacecost,
processfee => $processfee,
notforloan => $notforloan,
defaultreplacecost => $defaultreplacecost,
processfee => $processfee,
notforloan => $notforloan,
@@
-129,18
+148,24
@@
if ( $op eq 'add_form' ) {
sip_media_type => $sip_media_type,
hideinopac => $hideinopac,
searchcategory => $searchcategory,
sip_media_type => $sip_media_type,
hideinopac => $hideinopac,
searchcategory => $searchcategory,
+ rentalcharge_daily_calendar => $rentalcharge_daily_calendar,
+ rentalcharge_hourly_calendar => $rentalcharge_hourly_calendar,
+ automatic_checkin => $automatic_checkin,
}
);
}
);
- eval { $itemtype->store; };
+ eval {
+ $itemtype->store;
+ $itemtype->replace_library_limits( \@branches );
+ };
if ($@) {
if ($@) {
- push @messages, { type => '
error
', code => 'error_on_insert' };
+ push @messages, { type => '
alert
', code => 'error_on_insert' };
} else {
push @messages, { type => 'message', code => 'success_on_insert' };
}
} else {
push @messages,
} else {
push @messages, { type => 'message', code => 'success_on_insert' };
}
} else {
push @messages,
- { type => '
error
',
+ { type => '
alert
',
code => 'already_exists',
};
}
code => 'already_exists',
};
}
@@
-152,7
+177,7
@@
if ( $op eq 'add_form' ) {
my $itemtype = Koha::ItemTypes->find($itemtype_code);
my $can_be_deleted = $itemtype->can_be_deleted();
if ($can_be_deleted == 0) {
my $itemtype = Koha::ItemTypes->find($itemtype_code);
my $can_be_deleted = $itemtype->can_be_deleted();
if ($can_be_deleted == 0) {
- push @messages, { type => '
error
', code => 'cannot_be_deleted'};
+ push @messages, { type => '
alert
', code => 'cannot_be_deleted'};
$op = 'list';
} else {
$template->param( itemtype => $itemtype, );
$op = 'list';
} else {
$template->param( itemtype => $itemtype, );
@@
-163,7
+188,7
@@
if ( $op eq 'add_form' ) {
my $itemtype = Koha::ItemTypes->find($itemtype_code);
my $deleted = eval { $itemtype->delete };
if ( $@ or not $deleted ) {
my $itemtype = Koha::ItemTypes->find($itemtype_code);
my $deleted = eval { $itemtype->delete };
if ( $@ or not $deleted ) {
- push @messages, { type => '
error
', code => 'error_on_delete' };
+ push @messages, { type => '
alert
', code => 'error_on_delete' };
} else {
push @messages, { type => 'message', code => 'success_on_delete' };
}
} else {
push @messages, { type => 'message', code => 'success_on_delete' };
}
@@
-172,9
+197,8
@@
if ( $op eq 'add_form' ) {
}
if ( $op eq 'list' ) {
}
if ( $op eq 'list' ) {
- my $itemtypes = Koha::ItemTypes->search;
$template->param(
$template->param(
- itemtypes =>
$itemtypes
,
+ itemtypes =>
Koha::ItemTypes->search
,
messages => \@messages,
);
}
messages => \@messages,
);
}