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

Bug 12913: [QA Follow-up] Reword 'change item status' and add zero status 

The zero status should be added in @notforloans. It is a legitimate status
for available books. The zero status description can be translated in
the template.
The 'Change item status' is confusing. We mean that we saw a notforloan
status that we do not expect (read: does not exist in the table).

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 664d653417)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
This commit is contained in:
Marcel de Rooy 2017-03-28 16:39:25 +02:00 committed by Katrin Fischer
parent f75915336c
commit dbb0b4a4b0
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
View File

@ -177,12 +177,18 @@ $(document).ready(function(){
<legend>[% status.fieldname %]</legend>
<ul id="statuses-[% fieldname %]" style="display: inline;">
[% FOREACH value IN status.values %]
[% IF (value.lib) %]<li>
[% IF (value.lib) %]
<li>
<label for="[% value.id %]">
[% value.lib %]
[% IF value.authorised_value==0 %]
For loan
[% ELSE %]
[% value.lib %]
[% END %]
</label>
<input type="checkbox" name="status-[% status.fieldname %]-[% value.authorised_value %]" id="[% value.authorised_value %]" />
</li>[% END %]
</li>
[% END %]
[% END %]
</ul>
</fieldset>
@ -291,7 +297,7 @@ $(document).ready(function(){
[% ELSIF result.problem == 'missingitem' %]
<p>Item missing</p>
[% ELSIF result.problem == 'changestatus' %]
<p>Change item status</p>
<p>Unknown not-for-loan status</p>
[% ELSIF result.problem == 'not_scanned' %]
<p>Item should have been scanned</p>
[% END %]

7
tools/inventory.pl
View File

@ -94,11 +94,14 @@ for my $statfield (qw/items.notforloan items.itemlost items.withdrawn items.dama
$hash->{authcode} = $mss->count ? $mss->next->authorised_value : undef;
if ($hash->{authcode}){
my $arr = GetAuthorisedValues($hash->{authcode});
$hash->{values} = $arr;
push @$statuses, $hash;
if ( $statfield eq 'items.notforloan') {
# Add notforloan == 0 to the list of possible notforloan statuses
# The lib value is replaced in the template
push @$arr, { authorised_value => 0, id => 'stat0' , lib => 'ignore' };
@notforloans = map { $_->{'authorised_value'} } @$arr;
}
$hash->{values} = $arr;
push @$statuses, $hash;
}
}