Skip to content
Snippets Groups Projects
Commit f8acfa44 authored by Ere Maijala's avatar Ere Maijala Committed by Demian Katz
Browse files

Better unknown status support for "multiple_locations = group" setting.

parent 76e303a8
Branches
Tags
No related merge requests found
...@@ -416,6 +416,7 @@ class AjaxController extends AbstractBase ...@@ -416,6 +416,7 @@ class AjaxController extends AbstractBase
&& $info['use_unknown_message'] == true && $info['use_unknown_message'] == true
) { ) {
$use_unknown_status = true; $use_unknown_status = true;
$locations[$info['location']]['status_unknown'] = true;
} }
// Store call number/location info: // Store call number/location info:
$locations[$info['location']]['callnumbers'][] = $info['callnumber']; $locations[$info['location']]['callnumbers'][] = $info['callnumber'];
...@@ -437,7 +438,9 @@ class AjaxController extends AbstractBase ...@@ -437,7 +438,9 @@ class AjaxController extends AbstractBase
ENT_COMPAT, 'UTF-8' ENT_COMPAT, 'UTF-8'
), ),
'callnumbers' => 'callnumbers' =>
htmlentities($locationCallnumbers, ENT_COMPAT, 'UTF-8') htmlentities($locationCallnumbers, ENT_COMPAT, 'UTF-8'),
'status_unknown' => isset($details['status_unknown'])
? $details['status_unknown'] : false
]; ];
$locationList[] = $locationInfo; $locationList[] = $locationInfo;
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -94,6 +94,7 @@ i.fa-sounddisc {background-image:url('../../images/icons/cd.png'); &:extend(.bp- ...@@ -94,6 +94,7 @@ i.fa-sounddisc {background-image:url('../../images/icons/cd.png'); &:extend(.bp-
i.fa-soundrecording {background-image:url('../../images/icons/sound.png'); &:extend(.bp-icon);} i.fa-soundrecording {background-image:url('../../images/icons/sound.png'); &:extend(.bp-icon);}
i.fa-spinner {background-image:url('../../images/icons/ajax_loading.gif'); &:extend(.bp-icon);} i.fa-spinner {background-image:url('../../images/icons/ajax_loading.gif'); &:extend(.bp-icon);}
i.fa-star {background-image:url('../../images/icons/star.png'); &:extend(.bp-icon);} i.fa-star {background-image:url('../../images/icons/star.png'); &:extend(.bp-icon);}
i.fa-status-unknown {background-image:url('../../images/icons/bullet_orange.png'); &:extend(.bp-icon);}
i.fa-suitcase {background-image:url('../../images/icons/bookbag.png'); &:extend(.bp-icon);} i.fa-suitcase {background-image:url('../../images/icons/bookbag.png'); &:extend(.bp-icon);}
i.fa-tapecartridge {background-image:url('../../images/icons/drive.png'); &:extend(.bp-icon);} i.fa-tapecartridge {background-image:url('../../images/icons/drive.png'); &:extend(.bp-icon);}
i.fa-tapecassette {background-image:url('../../images/icons/drive.png'); &:extend(.bp-icon);} i.fa-tapecassette {background-image:url('../../images/icons/drive.png'); &:extend(.bp-icon);}
......
...@@ -46,6 +46,13 @@ function checkItemStatuses() { ...@@ -46,6 +46,13 @@ function checkItemStatuses() {
if (result.locationList[x].availability) { if (result.locationList[x].availability) {
locationListHTML += '<i class="fa fa-ok text-success"></i> <span class="text-success">' locationListHTML += '<i class="fa fa-ok text-success"></i> <span class="text-success">'
+ result.locationList[x].location + '</span> '; + result.locationList[x].location + '</span> ';
} else if (typeof(result.locationList[x].status_unknown) !== 'undefined'
&& result.locationList[x].status_unknown
) {
if (result.locationList[x].location) {
locationListHTML += '<i class="fa fa-status-unknown text-warning"></i> <span class="text-warning">'
+ result.locationList[x].location + '</span> ';
}
} else { } else {
locationListHTML += '<i class="fa fa-remove text-error"></i> <span class="text-error"">' locationListHTML += '<i class="fa fa-remove text-error"></i> <span class="text-error"">'
+ result.locationList[x].location + '</span> '; + result.locationList[x].location + '</span> ';
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment