Lines 355-360
Link Here
|
355 |
[% request.statusalias.lib | html %] |
355 |
[% request.statusalias.lib | html %] |
356 |
[% ELSE %] |
356 |
[% ELSE %] |
357 |
[% request.capabilities.$req_status.name | html%] |
357 |
[% request.capabilities.$req_status.name | html%] |
|
|
358 |
[% IF request.requested_partners.length > 0 %] |
359 |
([% request.requested_partners | html %]) |
360 |
[% END %] |
358 |
[% END %] |
361 |
[% END %] |
359 |
</li> |
362 |
</li> |
360 |
<li class="updated"> |
363 |
<li class="updated"> |
Lines 585-591
Link Here
|
585 |
var uniques = {}; |
588 |
var uniques = {}; |
586 |
tableData.forEach(function(row) { |
589 |
tableData.forEach(function(row) { |
587 |
var resolvedName = getStatusName( |
590 |
var resolvedName = getStatusName( |
588 |
oData[0].capabilities[row.status].name |
591 |
oData[0].capabilities[row.status].name, |
|
|
592 |
row |
589 |
); |
593 |
); |
590 |
uniques[resolvedName] = 1 |
594 |
uniques[resolvedName] = 1 |
591 |
}); |
595 |
}); |
Lines 766-786
Link Here
|
766 |
var status_name = meta.settings.oInit.originalData[0].capabilities[ |
770 |
var status_name = meta.settings.oInit.originalData[0].capabilities[ |
767 |
row.status |
771 |
row.status |
768 |
].name; |
772 |
].name; |
769 |
return getStatusName(status_name); |
773 |
return getStatusName(status_name, row); |
770 |
} else { |
774 |
} else { |
771 |
return ''; |
775 |
return ''; |
772 |
} |
776 |
} |
773 |
} |
777 |
} |
774 |
}; |
778 |
}; |
775 |
|
779 |
|
776 |
var getStatusName = function(origName) { |
780 |
var getStatusName = function(origName, row) { |
777 |
switch( origName ) { |
781 |
switch( origName ) { |
778 |
case "New request": |
782 |
case "New request": |
779 |
return _("New request"); |
783 |
return _("New request"); |
780 |
case "Requested": |
784 |
case "Requested": |
781 |
return _("Requested"); |
785 |
return _("Requested"); |
782 |
case "Requested from partners": |
786 |
case "Requested from partners": |
783 |
return _("Requested from partners"); |
787 |
var statStr = _("Requested from partners"); |
|
|
788 |
if ( |
789 |
row.hasOwnProperty('requested_partners') && |
790 |
row.requested_partners && |
791 |
row.requested_partners.length > 0 |
792 |
) { |
793 |
statStr += ' (' + row.requested_partners + ')'; |
794 |
} |
795 |
return statStr; |
784 |
case "Request reverted": |
796 |
case "Request reverted": |
785 |
return _("Request reverted"); |
797 |
return _("Request reverted"); |
786 |
case "Queued request": |
798 |
case "Queued request": |
Lines 878-884
Link Here
|
878 |
// Get our data from the API and process it prior to passing |
890 |
// Get our data from the API and process it prior to passing |
879 |
// it to datatables |
891 |
// it to datatables |
880 |
var ajax = $.ajax( |
892 |
var ajax = $.ajax( |
881 |
'/api/v1/illrequests?embed=metadata,patron,capabilities,library' |
893 |
'/api/v1/illrequests?embed=metadata,patron,capabilities,library,comments,status_alias,requested_partners' |
882 |
).done(function() { |
894 |
).done(function() { |
883 |
var data = JSON.parse(ajax.responseText); |
895 |
var data = JSON.parse(ajax.responseText); |
884 |
// Make a copy, we'll be removing columns next and need |
896 |
// Make a copy, we'll be removing columns next and need |
885 |
- |
|
|