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

Bug 20941: (QA follow-up) Fix return value of get_type, make templates more consistant 

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Josef Moravec 2018-10-04 07:44:53 +00:00 committed by Nick Clemens
parent 7cecc27e01
commit aced7b10de
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Koha/Illrequest.pm
View File

@ -748,7 +748,8 @@ Return a string representing the material type of this request or undef
sub get_type {
my ($self) = @_;
my $attr = $self->illrequestattributes->find({ type => 'type'});
return $attr ? $attr->value : undef;
return if !$attr;
return $attr->value;
};
#### Illrequests Imports

6
koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
View File

@ -450,7 +450,7 @@
</li>
<li class="medium">
<label class="medium">Request type:</label>
[% type ? type : 'N/A' | html %]
[% type || 'N/A' | html %]
</li>
<li class="cost">
<label class="cost">Cost:</label>
@ -559,8 +559,8 @@
</div>
<div class="medium">
<span class="label medium">Request type:</span>
[% type = request.get_type %]
[% type ? type : 'N/A' | html %]
% type = request.get_type %]
[% type || 'N/A' | html %]
</div>
<div class="cost">
<span class="label cost">Cost:</span>

4
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
View File

@ -136,7 +136,7 @@
[% IF request.metadata.Title %][% request.metadata.Title | html %][% ELSE %]<span>N/A</span>[% END %]
</td>
<td>[% request.backend | html %]</td>
<td>[% type ? type : '<span>N/A</span>' | html %]</td>
<td>[% type || 'N/A' | html %]</td>
<td>[% request.capabilities.$status.name | html %]</td>
<td><span title="[% request.placed | html %]">[% request.placed | $KohaDates %]</span></td>
<td><span title="[% request.updated | html %]">[% request.updated | $KohaDates %]</span></td>
@ -180,7 +180,7 @@
</li>
<li>
<label for="medium">Request type:</label>
[% type ? type : '<span>N/A</span>' | html %]
[% type || 'N/A' | html %]
</li>
<li>
<label for="placed">Request placed:</label>

4
t/db_dependent/Illrequests.t
View File

@ -85,8 +85,8 @@ subtest 'Basic object tests' => sub {
is($illrq_obj->backend, $illrq->{backend},
"Backend getter works.");
is($illrq_obj->get_type, '<span>N/A</span>',
'get_type() returns placeholder if no type is set');
is($illrq_obj->get_type, undef,
'get_type() returns undef if no type is set');
$builder->build({
source => 'Illrequestattribute',
value => {