Bug 17748: (follow-up) Remove availability column
Items can now only be filtered by 'Checked out' or 'not' rather than looking at damaged/itemlost/withdrawn/notforloan status. Removed availability column as Checked out items are made clear by the due date column. Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
parent
67ac388822
commit
ab3d2e4673
|
|
@ -1468,7 +1468,7 @@ sub SearchItems {
|
|||
|
||||
if ( $params->{sortby} eq 'availability' ) {
|
||||
my $sortorder = (uc($params->{sortorder}) eq 'ASC') ? 'ASC' : 'DESC';
|
||||
$query .= qq{ ORDER BY onloan $sortorder, damaged $sortorder, withdrawn $sortorder, notforloan $sortorder, itemlost $sortorder };
|
||||
$query .= qq{ ORDER BY onloan $sortorder };
|
||||
} else {
|
||||
my $sortby = (0 < grep {$params->{sortby} eq $_} @columns)
|
||||
? $params->{sortby} : 'itemnumber';
|
||||
|
|
|
|||
|
|
@ -37,6 +37,4 @@
|
|||
[%- delimiter | $raw -%]
|
||||
"[% (item.issues || 0) | $raw %]"
|
||||
[%- delimiter | $raw -%]
|
||||
"[% IF item.onloan %]Checked out[% ELSIF item.withdrawn || item.damaged || item.notforloan || item.itemlost %]Not available[% ELSE %]Available[% END %]"
|
||||
[%- delimiter | $raw -%]
|
||||
"[% IF item.checkout %][% item.checkout.date_due | $KohaDates | $raw %][% END %]"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
"[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) || "" | html %]",
|
||||
"[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => item.withdrawn ) || "" | html %]",
|
||||
"[% (item.issues || 0) | html %]",
|
||||
"[% IF item.onloan %]Checked out[% ELSIF item.withdrawn || item.damaged || item.notforloan || item.itemlost %]Not available[% ELSE %]Available[% END %]",
|
||||
"[% IF item.checkout %][% item.checkout.date_due | $KohaDates | html %][% END %]",
|
||||
"[% FILTER escape_quotes ~%]
|
||||
<div class="btn-group dropup"><button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-pencil"></i> Edit <span class="caret"></span> </button> <ul class="dropdown-menu pull-right"> <li><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]">Edit item</a></li> <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% item.biblionumber | html %]">Edit record</a></li> </ul> </div>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,5 @@
|
|||
[%- delimiter | $raw -%]
|
||||
"Checkouts"
|
||||
[%- delimiter | $raw -%]
|
||||
"Availability"
|
||||
[%- delimiter | $raw -%]
|
||||
"Due date"
|
||||
[%- END -%]
|
||||
|
|
|
|||
|
|
@ -210,8 +210,6 @@
|
|||
<label for="onloan_indifferent">Ignore</label>
|
||||
<input type="radio" name="onloan" id="onloan_yes" value="IS NOT NULL" />
|
||||
<label for="onloan_yes">Checked out</label>
|
||||
<input type="radio" name="onloan" id="onloan_no" value="IS NULL" />
|
||||
<label for="onloan_no">Available</label>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
|
|
@ -336,7 +334,6 @@
|
|||
+ ' <th id="items_itemlost">' + _("Lost status") + '</th>'
|
||||
+ ' <th id="items_widthdrawn">' + _("Withdrawn status") + '</th>'
|
||||
+ ' <th id="items_checkouts">' + _("Checkouts") + '</th>'
|
||||
+ ' <th id="items_availability">' + _("Availability") + '</th>'
|
||||
+ ' <th id="items_date_due">' + _("Due date") + '</th>'
|
||||
+ ' <th id=""></th>'
|
||||
+ ' </tr>'
|
||||
|
|
@ -494,7 +491,6 @@
|
|||
{ 'sName': 'itemlost' },
|
||||
{ 'sName': 'withdrawn' },
|
||||
{ 'sName': 'issues' },
|
||||
{ 'sName': 'availability' },
|
||||
{ 'sName': 'date_due' },
|
||||
{ 'sName': 'actions', 'bSortable': false }
|
||||
],
|
||||
|
|
@ -544,7 +540,6 @@
|
|||
[% END %]
|
||||
{ 'type': 'text' },
|
||||
{ 'type': 'text' },
|
||||
{ 'type': 'text' },
|
||||
null
|
||||
]
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue