Bug 19889: (follow-up) Fix few minor things
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> JD amended patch: remove unecessary indentation changes Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Agustin Moyano
Jonathan Druart
parent
785265aea0
commit
c1be2b8817
|
|
@ -409,8 +409,8 @@ sub MapItemsToHoldRequests {
|
|||
next
|
||||
if ( !$item->{holdallowed} )
|
||||
|| ( $item->{holdallowed} == 1
|
||||
&& $item->{homebranch} ne $request->{borrowerbranch}
|
||||
|| $item->{_object}->exclude_from_local_holds_priority );
|
||||
&& $item->{homebranch} ne $request->{borrowerbranch} )
|
||||
|| $item->{_object}->exclude_from_local_holds_priority;
|
||||
|
||||
next if $request->{itemnumber} && $request->{itemnumber} != $item->{itemnumber};
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
|
|||
);
|
||||
|
||||
$template->param(
|
||||
updated_exclude_from_local_holds_priority => $query->param('updated_exclude_from_local_holds_priority')
|
||||
updated_exclude_from_local_holds_priority => scalar($query->param('updated_exclude_from_local_holds_priority'))
|
||||
);
|
||||
|
||||
if($query->cookie("holdfor")){
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ for ($damaged,$itemlost,$withdrawn) {
|
|||
}
|
||||
}
|
||||
|
||||
my $alerts = q{};
|
||||
my $messages = q{};
|
||||
|
||||
# modify MARC item if input differs from items table.
|
||||
if ( $op eq "set_non_public_note" ) {
|
||||
|
|
@ -76,7 +76,7 @@ elsif ( $op eq "set_public_note" ) { # i.e., itemnotes parameter passed from for
|
|||
$item->withdrawn($withdrawn);
|
||||
} elsif ( $op eq "set_exclude_priority" && $exclude_from_local_holds_priority ne $item_data_hashref->{'exclude_from_local_holds_priority'}) {
|
||||
$item->exclude_from_local_holds_priority($exclude_from_local_holds_priority);
|
||||
$alerts = "updated_exclude_from_local_holds_priority=$exclude_from_local_holds_priority&";
|
||||
$messages = "updated_exclude_from_local_holds_priority=$exclude_from_local_holds_priority&";
|
||||
} elsif ( $op eq "set_damaged" && $damaged ne $item_data_hashref->{'damaged'}) {
|
||||
$item->damaged($damaged);
|
||||
} else {
|
||||
|
|
@ -89,4 +89,4 @@ $item->store;
|
|||
|
||||
LostItem($itemnumber, 'moredetail') if $op eq "set_lost";
|
||||
|
||||
print $cgi->redirect("moredetail.pl?" . $alerts . "biblionumber=$biblionumber&itemnumber=$itemnumber#item$itemnumber");
|
||||
print $cgi->redirect("moredetail.pl?" . $messages . "biblionumber=$biblionumber&itemnumber=$itemnumber#item$itemnumber");
|
||||
|
|
|
|||
|
|
@ -436,6 +436,7 @@
|
|||
<th scope="col">Check previous checkout?</th>
|
||||
[% END %]
|
||||
<th scope="col">Default privacy</th>
|
||||
<th scope="col">Exclude from local holds priority</th>
|
||||
<th scope="col">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -549,6 +550,13 @@
|
|||
Forever
|
||||
[% END %]
|
||||
</td>
|
||||
<td>
|
||||
[% IF category.exclude_from_local_holds_priority %]
|
||||
Yes
|
||||
[% ELSE %]
|
||||
No
|
||||
[% END %]
|
||||
</td>
|
||||
<td class="actions">
|
||||
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode |uri %]"><i class="fa fa-pencil"></i> Edit</a>
|
||||
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&categorycode=[% category.categorycode |uri %]"><i class="fa fa-trash"></i> Delete</a>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,11 @@
|
|||
[% IF updated_exclude_from_local_holds_priority.defined %]
|
||||
<div class="dialog message">
|
||||
<i>Exclude from local holds priority</i> updated to
|
||||
[% IF updated_exclude_from_local_holds_priority %]<i>Yes</i>[% ELSE %]<i>No</i>[% END %]
|
||||
[% IF updated_exclude_from_local_holds_priority %]
|
||||
<i>Yes</i>
|
||||
[% ELSE %]
|
||||
<i>No</i>
|
||||
[% END %]
|
||||
</div>
|
||||
[% END %]
|
||||
|
||||
|
|
|
|||
|
|
@ -336,7 +336,7 @@ $(document).ready(function(){
|
|||
</ol>
|
||||
</fieldset>
|
||||
<fieldset class="rows">
|
||||
<legend>Priority</legend>
|
||||
<legend>Other attributes</legend>
|
||||
<ol>
|
||||
<li>
|
||||
<div class="subfield_line">
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ if ($op eq "action") {
|
|||
my $job = C4::BackgroundJob->fetch($sessionID, $completedJobID);
|
||||
|
||||
# Calling the template
|
||||
add_saved_job_results_to_template($template, $completedJobID);
|
||||
add_saved_job_results_to_template($template, $completedJobID, $items_display_hashref);
|
||||
|
||||
} else {
|
||||
# While the job is getting done
|
||||
|
|
@ -186,12 +186,20 @@ if ($op eq "action") {
|
|||
}
|
||||
}
|
||||
|
||||
my $yesno = Koha::AuthorisedValues->search({category => 'YES_NO'});
|
||||
my $ynhash = {};
|
||||
|
||||
while(my $yn = $yesno->next) {
|
||||
$ynhash->{'av'.$yn->authorised_value} = $yn->lib;
|
||||
}
|
||||
|
||||
try {
|
||||
my $schema = Koha::Database->new->schema;
|
||||
$schema->txn_do(
|
||||
sub {
|
||||
# For each item
|
||||
my $i = 1;
|
||||
my $extra_headers = {};
|
||||
foreach my $itemnumber (@itemnumbers) {
|
||||
$job->progress($i) if $runinbackground;
|
||||
my $item = Koha::Items->find($itemnumber);
|
||||
|
|
@ -233,9 +241,13 @@ if ($op eq "action") {
|
|||
}
|
||||
else {
|
||||
my $modified_holds_priority = 0;
|
||||
if (defined $exclude_from_local_holds_priority && $item->exclude_from_local_holds_priority != $exclude_from_local_holds_priority) {
|
||||
if (defined $exclude_from_local_holds_priority) {
|
||||
if($item->exclude_from_local_holds_priority != $exclude_from_local_holds_priority) {
|
||||
$item->exclude_from_local_holds_priority($exclude_from_local_holds_priority)->store;
|
||||
$modified_holds_priority = 1;
|
||||
}
|
||||
$extra_headers->{exclude_from_local_holds_priority} = {name => 'Exclude from local holds priority', items => {}} unless defined $extra_headers->{exclude_from_local_holds_priority};
|
||||
$extra_headers->{exclude_from_local_holds_priority}->{items}->{$item->itemnumber} = $ynhash->{'av'.$item->exclude_from_local_holds_priority};
|
||||
}
|
||||
my $modified = 0;
|
||||
if ( $values_to_modify || $values_to_blank ) {
|
||||
|
|
@ -305,6 +317,7 @@ if ($op eq "action") {
|
|||
{
|
||||
modified_items => $modified_items,
|
||||
modified_fields => $modified_fields,
|
||||
extra_headers => $extra_headers,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
@ -772,12 +785,22 @@ sub add_results_to_template {
|
|||
sub add_saved_job_results_to_template {
|
||||
my $template = shift;
|
||||
my $completedJobID = shift;
|
||||
my $items_display_hashref= shift;
|
||||
my $job = C4::BackgroundJob->fetch($sessionID, $completedJobID);
|
||||
my $results = $job->results();
|
||||
add_results_to_template($template, $results);
|
||||
|
||||
my $fields = $job->get("modified_fields");
|
||||
my $items = $job->get("modified_items");
|
||||
my $extra_headers = $job->get("extra_headers");
|
||||
|
||||
foreach my $header (keys %{$extra_headers}) {
|
||||
push @{$items_display_hashref->{item_header_loop}}, {header_value => $extra_headers->{$header}->{name}};
|
||||
foreach my $row (@{$items_display_hashref->{item_loop}}) {
|
||||
push @{$row->{item_value}}, {field => $extra_headers->{$header}->{items}->{$row->{itemnumber}}};
|
||||
}
|
||||
}
|
||||
|
||||
$template->param(
|
||||
modified_items => $items,
|
||||
modified_fields => $fields,
|
||||
|
|
|
|||
Loading…
Reference in New Issue