diff --git a/module/VuFind/src/VuFind/AjaxHandler/AbstractBase.php b/module/VuFind/src/VuFind/AjaxHandler/AbstractBase.php
index 3b313059a537aa86bdf08148198acdd32c4b4176..40f6bcc9ffbca04da48242342ecea60e7ca02da5 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/AbstractBase.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/AbstractBase.php
@@ -66,17 +66,14 @@ abstract class AbstractBase implements AjaxHandlerInterface
/**
* Format a response array.
*
- * @param mixed $response Response data
- * @param string $status Internal status code (see constants in interface;
- * defaults to OK)
- * @param int $httpCode HTTP status code (omit for default)
+ * @param mixed $response Response data
+ * @param int $httpCode HTTP status code (omit for default)
*
* @return array
*/
- protected function formatResponse($response, $status = self::STATUS_OK,
- $httpCode = null
- ) {
- $arr = [$response, $status];
+ protected function formatResponse($response, $httpCode = null)
+ {
+ $arr = [$response];
if ($httpCode !== null) {
$arr[] = $httpCode;
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/AjaxHandlerInterface.php b/module/VuFind/src/VuFind/AjaxHandler/AjaxHandlerInterface.php
index b27e5d2940e0ddf02fc536e87a90a52d534b6b07..041b3e308d5f0559ed1cf1cd55ea0d016d335bb3 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/AjaxHandlerInterface.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/AjaxHandlerInterface.php
@@ -41,16 +41,18 @@ use Zend\Mvc\Controller\Plugin\Params;
interface AjaxHandlerInterface
{
// define some status constants
- const STATUS_OK = 'OK'; // good
- const STATUS_ERROR = 'ERROR'; // bad
- const STATUS_NEED_AUTH = 'NEED_AUTH'; // must login first
+ const STATUS_HTTP_BAD_REQUEST = 400; // bad request
+ const STATUS_HTTP_NEED_AUTH = 401; // must login first
+ const STATUS_HTTP_FORBIDDEN = 403; // method is unavailable
+ const STATUS_HTTP_ERROR = 500; // an error occurred
+ const STATUS_HTTP_UNAVAILABLE = 503; // temporarily unavailable
/**
* Handle a request.
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params);
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/CheckRequestIsValid.php b/module/VuFind/src/VuFind/AjaxHandler/CheckRequestIsValid.php
index c3a9c19de35705084b02d00b714ff605876da88b..df2b2c4efe278a7818e36f677642ceab7d17268d 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/CheckRequestIsValid.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/CheckRequestIsValid.php
@@ -84,7 +84,7 @@ class CheckRequestIsValid extends AbstractIlsAndUserAction
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -95,16 +95,14 @@ class CheckRequestIsValid extends AbstractIlsAndUserAction
if (empty($id) || empty($data)) {
return $this->formatResponse(
$this->translate('bulk_error_missing'),
- self::STATUS_ERROR,
- 400
+ self::STATUS_HTTP_BAD_REQUEST
);
}
// check if user is logged in
if (!$this->user) {
return $this->formatResponse(
$this->translate('You must be logged in first'),
- self::STATUS_NEED_AUTH,
- 401
+ self::STATUS_HTTP_NEED_AUTH
);
}
@@ -139,7 +137,7 @@ class CheckRequestIsValid extends AbstractIlsAndUserAction
}
return $this->formatResponse(
- $this->translate('An error has occurred'), self::STATUS_ERROR, 500
+ $this->translate('An error has occurred'), self::STATUS_HTTP_ERROR
);
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/CommentRecord.php b/module/VuFind/src/VuFind/AjaxHandler/CommentRecord.php
index d7e00bd8fef769c986c6b201ff1bc9db341fd2c5..50c66b7db2bab648a8f6afeed4b95815d29037b5 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/CommentRecord.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/CommentRecord.php
@@ -113,7 +113,7 @@ class CommentRecord extends AbstractBase implements TranslatorAwareInterface
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -121,16 +121,14 @@ class CommentRecord extends AbstractBase implements TranslatorAwareInterface
if (!$this->enabled) {
return $this->formatResponse(
$this->translate('Comments disabled'),
- self::STATUS_ERROR,
- 403
+ self::STATUS_HTTP_BAD_REQUEST
);
}
if ($this->user === false) {
return $this->formatResponse(
$this->translate('You must be logged in first'),
- self::STATUS_NEED_AUTH,
- 401
+ self::STATUS_HTTP_NEED_AUTH
);
}
@@ -140,20 +138,19 @@ class CommentRecord extends AbstractBase implements TranslatorAwareInterface
if (empty($id) || empty($comment)) {
return $this->formatResponse(
$this->translate('bulk_error_missing'),
- self::STATUS_ERROR,
- 400
+ self::STATUS_HTTP_BAD_REQUEST
);
}
if (!$this->checkCaptcha($params)) {
return $this->formatResponse(
$this->translate('recaptcha_not_passed'),
- self::STATUS_ERROR,
- 403
+ self::STATUS_HTTP_FORBIDDEN
);
}
$resource = $this->table->findResource($id, $source);
- return $this->formatResponse($resource->addComment($comment, $this->user));
+ $commentId = $resource->addComment($comment, $this->user);
+ return $this->formatResponse(compact('commentId'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/DeleteRecordComment.php b/module/VuFind/src/VuFind/AjaxHandler/DeleteRecordComment.php
index 87edced8b10be1b7377c5a0b90453867b0e2ef8f..822ee6a6c624eb981591372e16e029f53524d2d6 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/DeleteRecordComment.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/DeleteRecordComment.php
@@ -85,7 +85,7 @@ class DeleteRecordComment extends AbstractBase implements TranslatorAwareInterfa
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -93,16 +93,14 @@ class DeleteRecordComment extends AbstractBase implements TranslatorAwareInterfa
if (!$this->enabled) {
return $this->formatResponse(
$this->translate('Comments disabled'),
- self::STATUS_ERROR,
- 403
+ self::STATUS_HTTP_FORBIDDEN
);
}
if ($this->user === false) {
return $this->formatResponse(
$this->translate('You must be logged in first'),
- self::STATUS_NEED_AUTH,
- 401
+ self::STATUS_HTTP_AUTH
);
}
@@ -110,18 +108,16 @@ class DeleteRecordComment extends AbstractBase implements TranslatorAwareInterfa
if (empty($id)) {
return $this->formatResponse(
$this->translate('bulk_error_missing'),
- self::STATUS_ERROR,
- 400
+ self::STATUS_HTTP_BAD_REQUEST
);
}
if (!$this->table->deleteIfOwnedByUser($id, $this->user)) {
return $this->formatResponse(
$this->translate('edit_list_fail'),
- self::STATUS_ERROR,
- 403
+ self::STATUS_HTTP_FORBIDDEN
);
}
- return $this->formatResponse($this->translate('Done'));
+ return $this->formatResponse('');
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetACSuggestions.php b/module/VuFind/src/VuFind/AjaxHandler/GetACSuggestions.php
index e9ab3ef85e1b53bd4b6616d22e2d28d424768e10..50ab877b489fccfc841019ce11616e3f1d920d53 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetACSuggestions.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetACSuggestions.php
@@ -67,12 +67,13 @@ class GetACSuggestions extends AbstractBase
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
$this->disableSessionWrites(); // avoid session write timing bug
$query = new Parameters($params->fromQuery());
- return $this->formatResponse($this->suggester->getSuggestions($query));
+ $suggestions = $this->suggester->getSuggestions($query);
+ return $this->formatResponse(compact('suggestions'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetFacetData.php b/module/VuFind/src/VuFind/AjaxHandler/GetFacetData.php
index 2e1edc20ede34bcf3d48388242920eb6f7d635c7..f9129cd8ef59d3ac3b3c26ff58734fa1bf9cf548 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetFacetData.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetFacetData.php
@@ -87,7 +87,7 @@ class GetFacetData extends AbstractBase
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -103,19 +103,21 @@ class GetFacetData extends AbstractBase
$facets = $this->results->getFullFieldFacets([$facet], false, -1, 'count');
if (empty($facets[$facet]['data']['list'])) {
- return $this->formatResponse([]);
- }
+ $facets = [];
+ } else {
+ $facetList = $facets[$facet]['data']['list'];
- $facetList = $facets[$facet]['data']['list'];
+ if (!empty($sort)) {
+ $this->facetHelper->sortFacetList($facetList, $sort == 'top');
+ }
- if (!empty($sort)) {
- $this->facetHelper->sortFacetList($facetList, $sort == 'top');
+ $facets = $this->facetHelper->buildFacetArray(
+ $facet,
+ $facetList,
+ $this->results->getUrlQuery(),
+ false
+ );
}
-
- return $this->formatResponse(
- $this->facetHelper->buildFacetArray(
- $facet, $facetList, $this->results->getUrlQuery(), false
- )
- );
+ return $this->formatResponse(compact('facets'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetIlsStatus.php b/module/VuFind/src/VuFind/AjaxHandler/GetIlsStatus.php
index 973303ff78e1501b690a468d3ee7c64705d98eed..58116debd3d8a669623a0dedf0a307f7ab520461 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetIlsStatus.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetIlsStatus.php
@@ -82,7 +82,7 @@ class GetIlsStatus extends AbstractBase
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -94,6 +94,6 @@ class GetIlsStatus extends AbstractBase
$html = $this->renderer
->render('Helpers/ils-offline.phtml', compact('offlineModeMsg'));
}
- return $this->formatResponse($html ?? '');
+ return $this->formatResponse(['html' => $html ?? '']);
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetItemStatuses.php b/module/VuFind/src/VuFind/AjaxHandler/GetItemStatuses.php
index 6b1bbe1eadd82db5e4276552fa21a2070343f702..0cf49f7dd9f37b6619d7ee9ab76ad11748a0e4ca 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetItemStatuses.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetItemStatuses.php
@@ -400,7 +400,7 @@ class GetItemStatuses extends AbstractBase implements TranslatorAwareInterface
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -494,6 +494,6 @@ class GetItemStatuses extends AbstractBase implements TranslatorAwareInterface
}
// Done
- return $this->formatResponse($statuses);
+ return $this->formatResponse(compact('statuses'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetLibraryPickupLocations.php b/module/VuFind/src/VuFind/AjaxHandler/GetLibraryPickupLocations.php
index 6776cf54c00df7300b24bf21ef5d5949c2e8027f..51091d93d330efa0368c7fcd4a2c1859ab35ea89 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetLibraryPickupLocations.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetLibraryPickupLocations.php
@@ -47,7 +47,7 @@ class GetLibraryPickupLocations extends AbstractIlsAndUserAction
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -57,16 +57,14 @@ class GetLibraryPickupLocations extends AbstractIlsAndUserAction
if (null === $id || null === $pickupLib) {
return $this->formatResponse(
$this->translate('bulk_error_missing'),
- self::STATUS_ERROR,
- 400
+ self::STATUS_HTTP_BAD_REQUEST
);
}
// check if user is logged in
if (!$this->user) {
return $this->formatResponse(
$this->translate('You must be logged in first'),
- self::STATUS_NEED_AUTH,
- 401
+ self::STATUS_HTTP_AUTH
);
}
@@ -91,7 +89,7 @@ class GetLibraryPickupLocations extends AbstractIlsAndUserAction
}
return $this->formatResponse(
- $this->translate('An error has occurred'), self::STATUS_ERROR, 500
+ $this->translate('An error has occurred'), self::STATUS_HTTP_ERROR
);
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetRecordCommentsAsHTML.php b/module/VuFind/src/VuFind/AjaxHandler/GetRecordCommentsAsHTML.php
index 1154f8f4439b1cbba309a6563b529de32c79e36a..1b41047796b4a915a0d9512cd28683bb76fabd00 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetRecordCommentsAsHTML.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetRecordCommentsAsHTML.php
@@ -73,7 +73,7 @@ class GetRecordCommentsAsHTML extends AbstractBase
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -81,8 +81,8 @@ class GetRecordCommentsAsHTML extends AbstractBase
$params->fromQuery('id'),
$params->fromQuery('source', DEFAULT_SEARCH_BACKEND)
);
- return $this->formatResponse(
- $this->renderer->render('record/comments-list.phtml', compact('driver'))
- );
+ $html = $this->renderer
+ ->render('record/comments-list.phtml', compact('driver'));
+ return $this->formatResponse(compact('html'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetRecordDetails.php b/module/VuFind/src/VuFind/AjaxHandler/GetRecordDetails.php
index 68ff8ac64141261bb903124eff4331e1df484d2b..e8c4a1a866d2b3938fa27ae90d9c570c638b9850 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetRecordDetails.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetRecordDetails.php
@@ -105,7 +105,7 @@ class GetRecordDetails extends AbstractBase
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -133,6 +133,6 @@ class GetRecordDetails extends AbstractBase
)
]
);
- return $this->formatResponse($html);
+ return $this->formatResponse(compact('html'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetRecordTags.php b/module/VuFind/src/VuFind/AjaxHandler/GetRecordTags.php
index 97e9be3a9bdd466f0c881d65981fc0362435fdfb..23444f211233e24fefb9939493a04d10a281df25 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetRecordTags.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetRecordTags.php
@@ -83,7 +83,7 @@ class GetRecordTags extends AbstractBase
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -108,6 +108,6 @@ class GetRecordTags extends AbstractBase
$viewParams = ['tagList' => $tagList, 'loggedin' => (bool)$this->user];
$html = $this->renderer->render('record/taglist', $viewParams);
- return $this->formatResponse($html);
+ return $this->formatResponse(compact('html'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetRequestGroupPickupLocations.php b/module/VuFind/src/VuFind/AjaxHandler/GetRequestGroupPickupLocations.php
index a73749b06da0e3e1102f0a1362e4b198228cfafa..e48603fcd92fc05cbc1a72788343e29acb75ba64 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetRequestGroupPickupLocations.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetRequestGroupPickupLocations.php
@@ -47,7 +47,7 @@ class GetRequestGroupPickupLocations extends AbstractIlsAndUserAction
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -57,16 +57,14 @@ class GetRequestGroupPickupLocations extends AbstractIlsAndUserAction
if (null === $id || null === $requestGroupId) {
return $this->formatResponse(
$this->translate('bulk_error_missing'),
- self::STATUS_ERROR,
- 400
+ self::STATUS_HTTP_BAD_REQUEST
);
}
// check if user is logged in
if (!$this->user) {
return $this->formatResponse(
$this->translate('You must be logged in first'),
- self::STATUS_NEED_AUTH,
- 401
+ self::STATUS_HTTP_AUTH
);
}
@@ -93,7 +91,7 @@ class GetRequestGroupPickupLocations extends AbstractIlsAndUserAction
}
return $this->formatResponse(
- $this->translate('An error has occurred'), self::STATUS_ERROR, 500
+ $this->translate('An error has occurred'), self::STATUS_HTTP_ERROR
);
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php b/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php
index 7ccb410d40fd5d8482c1763eadb1c6240083fa39..16483c1aa03c7db72ddde29ef1ad0b1abf6540dc 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php
@@ -96,7 +96,7 @@ class GetResolverLinks extends AbstractBase implements TranslatorAwareInterface
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -109,8 +109,7 @@ class GetResolverLinks extends AbstractBase implements TranslatorAwareInterface
if (!$this->pluginManager->has($resolverType)) {
return $this->formatResponse(
$this->translate("Could not load driver for $resolverType"),
- self::STATUS_ERROR,
- 500
+ self::STATUS_HTTP_ERROR
);
}
$resolver = new Connection($this->pluginManager->get($resolverType));
@@ -162,6 +161,6 @@ class GetResolverLinks extends AbstractBase implements TranslatorAwareInterface
$html = $this->renderer->render('ajax/resolverLinks.phtml', $view);
// output HTML encoded in JSON object
- return $this->formatResponse($html);
+ return $this->formatResponse(compact('html'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetSaveStatuses.php b/module/VuFind/src/VuFind/AjaxHandler/GetSaveStatuses.php
index 4a10ed6479d868c5232009dc04408dfa0328024a..b81571a4ca8b92fdbae2e75367e0f85d396ddb0a 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetSaveStatuses.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetSaveStatuses.php
@@ -125,7 +125,7 @@ class GetSaveStatuses extends AbstractBase implements TranslatorAwareInterface
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -134,8 +134,7 @@ class GetSaveStatuses extends AbstractBase implements TranslatorAwareInterface
if (!$this->user) {
return $this->formatResponse(
$this->translate('You must be logged in first'),
- self::STATUS_NEED_AUTH,
- 401
+ self::STATUS_HTTP_AUTH
);
}
@@ -145,10 +144,10 @@ class GetSaveStatuses extends AbstractBase implements TranslatorAwareInterface
if (!is_array($ids) || !is_array($sources)) {
return $this->formatResponse(
$this->translate('Argument must be array.'),
- self::STATUS_ERROR,
- 400
+ self::STATUS_HTTP_BAD_REQUEST
);
}
- return $this->formatResponse($this->getDataFromUser($ids, $sources));
+ $statuses = $this->getDataFromUser($ids, $sources);
+ return $this->formatResponse(compact('statuses'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetVisData.php b/module/VuFind/src/VuFind/AjaxHandler/GetVisData.php
index 17fa1da34fe05aed157678ada591adcc5a64ae3b..79dc5421816ec2a255e0190c8d922b80ed086ecd 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetVisData.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetVisData.php
@@ -136,7 +136,7 @@ class GetVisData extends AbstractBase
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -152,6 +152,7 @@ class GetVisData extends AbstractBase
$rawDateFacets = $params->fromQuery('facetFields');
$dateFacets = empty($rawDateFacets) ? [] : explode(':', $rawDateFacets);
$fields = $this->processDateFacets($filters, $dateFacets);
- return $this->formatResponse($this->processFacetValues($filters, $fields));
+ $facets = $this->processFacetValues($filters, $fields);
+ return $this->formatResponse(compact('facets'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/KeepAlive.php b/module/VuFind/src/VuFind/AjaxHandler/KeepAlive.php
index a18769ff0ec9e0c6981d50aca9450c989eaef32a..1bb71cd1f7d13a13bf7b14fe91fa59900ca5eb4f 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/KeepAlive.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/KeepAlive.php
@@ -66,7 +66,7 @@ class KeepAlive extends AbstractBase
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
diff --git a/module/VuFind/src/VuFind/AjaxHandler/Recommend.php b/module/VuFind/src/VuFind/AjaxHandler/Recommend.php
index b28ef776bcb341f2f193191b9201b0499b3e4d2b..df4105b89e0519ba7d360221f22861f678ae0449 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/Recommend.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/Recommend.php
@@ -88,7 +88,7 @@ class Recommend extends AbstractBase
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
diff --git a/module/VuFind/src/VuFind/AjaxHandler/RelaisAvailability.php b/module/VuFind/src/VuFind/AjaxHandler/RelaisAvailability.php
index 64b564784766f2805c05394a09927a7ea151f248..17299a7f714a481127e939c319a70467538f9a47 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/RelaisAvailability.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/RelaisAvailability.php
@@ -45,7 +45,7 @@ class RelaisAvailability extends AbstractRelaisAction
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -56,7 +56,7 @@ class RelaisAvailability extends AbstractRelaisAction
$authorizationId = $this->relais->authenticatePatron();
if ($authorizationId === null) {
return $this->formatResponse(
- $this->translate('Failed'), self::STATUS_ERROR
+ $this->translate('Failed'), self::STATUS_HTTP_FORBIDDEN
);
}
@@ -66,8 +66,10 @@ class RelaisAvailability extends AbstractRelaisAction
|| strpos($responseText, 'ErrorMessage') !== false
|| strpos($responseText, 'false') !== false
) {
- return $this->formatResponse('no');
+ $result = 'no';
+ } else {
+ $result = 'ok';
}
- return $this->formatResponse('ok');
+ return $this->formatResponse(compact('result'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/RelaisInfo.php b/module/VuFind/src/VuFind/AjaxHandler/RelaisInfo.php
index af2f79ede381921c70a552afe1e4f214620c1a87..c4ca1c5fa5c98d6d6bda8f2a4899f9caae566827 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/RelaisInfo.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/RelaisInfo.php
@@ -45,7 +45,7 @@ class RelaisInfo extends AbstractRelaisAction
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -58,16 +58,18 @@ class RelaisInfo extends AbstractRelaisAction
$authorizationId = $authResponse->AuthorizationId ?? null;
if ($authorizationId === null) {
return $this->formatResponse(
- $this->translate('Failed'), self::STATUS_ERROR
+ $this->translate('Failed'), self::STATUS_HTTP_FORBIDDEN
);
}
$allowLoan = $authResponse->AllowLoanAddRequest ?? false;
if ($allowLoan == false) {
- return $this->formatResponse('AllowLoan was false', self::STATUS_ERROR);
+ return $this->formatResponse(
+ 'AllowLoan was false', self::STATUS_HTTP_ERROR
+ );
}
- $response = $this->relais->search($oclcNumber, $authorizationId, $lin);
- return $this->formatResponse($response);
+ $result = $this->relais->search($oclcNumber, $authorizationId, $lin);
+ return $this->formatResponse(compact('result'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/RelaisOrder.php b/module/VuFind/src/VuFind/AjaxHandler/RelaisOrder.php
index 98680981ad740eeeb769b1ebe66f476d9eaa08fa..689d8edcf1d48d45cf18e59e5151652a03cf1baf 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/RelaisOrder.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/RelaisOrder.php
@@ -45,7 +45,7 @@ class RelaisOrder extends AbstractRelaisAction
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
@@ -58,16 +58,16 @@ class RelaisOrder extends AbstractRelaisAction
$authorizationId = $this->relais->authenticatePatron($lin);
if ($authorizationId === null) {
return $this->formatResponse(
- $this->translate('Failed'), self::STATUS_ERROR
+ $this->translate('Failed'), self::STATUS_HTTP_FORBIDDEN
);
}
// Place order
- $responseText = $this->relais
+ $result = $this->relais
->placeRequest($oclcNumber, $authorizationId, $lin);
- if (strpos($responseText, 'error') !== false) {
- return $this->formatResponse($responseText, self::STATUS_ERROR);
+ if (strpos($result, 'error') !== false) {
+ return $this->formatResponse($result, self::STATUS_HTTP_ERROR);
}
- return $this->formatResponse($responseText);
+ return $this->formatResponse(compact('result'));
}
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/SystemStatus.php b/module/VuFind/src/VuFind/AjaxHandler/SystemStatus.php
index 53c7704a74e8b0c7bbff60281fd32aaf12c1eb41..771014dd86a95cf6d0133f06b86e37ff02ba96a7 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/SystemStatus.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/SystemStatus.php
@@ -97,7 +97,7 @@ class SystemStatus extends AbstractBase
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
@@ -108,7 +108,7 @@ class SystemStatus extends AbstractBase
&& file_exists($this->config->System->healthCheckFile)
) {
return $this->formatResponse(
- 'Health check file exists', self::STATUS_ERROR, 503
+ 'Health check file exists', self::STATUS_HTTP_UNAVAILABLE
);
}
@@ -120,7 +120,7 @@ class SystemStatus extends AbstractBase
$results->performAndProcessSearch();
} catch (\Exception $e) {
return $this->formatResponse(
- 'Search index error: ' . $e->getMessage(), self::STATUS_ERROR, 500
+ 'Search index error: ' . $e->getMessage(), self::STATUS_HTTP_ERROR
);
}
@@ -129,7 +129,7 @@ class SystemStatus extends AbstractBase
$this->sessionTable->getBySessionId('healthcheck', false);
} catch (\Exception $e) {
return $this->formatResponse(
- 'Database error: ' . $e->getMessage(), self::STATUS_ERROR, 500
+ 'Database error: ' . $e->getMessage(), self::STATUS_HTTP_ERROR
);
}
diff --git a/module/VuFind/src/VuFind/AjaxHandler/TagRecord.php b/module/VuFind/src/VuFind/AjaxHandler/TagRecord.php
index df3caa200a27ab15a4f555f3fcfd3b2a30f5fbe3..e8bd17b82aff81fb574c342358ab41f4e4c2a34c 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/TagRecord.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/TagRecord.php
@@ -86,15 +86,14 @@ class TagRecord extends AbstractBase implements TranslatorAwareInterface
*
* @param Params $params Parameter helper from controller
*
- * @return array [response data, internal status code, HTTP status code]
+ * @return array [response data, HTTP status code]
*/
public function handleRequest(Params $params)
{
if (!$this->user) {
return $this->formatResponse(
$this->translate('You must be logged in first'),
- self::STATUS_NEED_AUTH,
- 401
+ self::STATUS_HTTP_AUTH
);
}
@@ -109,6 +108,6 @@ class TagRecord extends AbstractBase implements TranslatorAwareInterface
: $driver->deleteTags($this->user, $this->tagParser->parse($tag));
}
- return $this->formatResponse($this->translate('Done'));
+ return $this->formatResponse('');
}
}
diff --git a/module/VuFind/src/VuFind/Controller/AjaxResponseTrait.php b/module/VuFind/src/VuFind/Controller/AjaxResponseTrait.php
index 7de03d5e7391d56af5f717efc5b819dc01dfb29a..e7d2ef4431ad68a46e298738c389e20b812748e2 100644
--- a/module/VuFind/src/VuFind/Controller/AjaxResponseTrait.php
+++ b/module/VuFind/src/VuFind/Controller/AjaxResponseTrait.php
@@ -64,24 +64,25 @@ trait AjaxResponseTrait
/**
* Format the content of the AJAX response based on the response type.
*
- * @param string $type Content-type of output
- * @param mixed $data The response data
- * @param string $status Status of the request
+ * @param string $type Content-type of output
+ * @param mixed $data The response data
+ * @param int $httpCode A custom HTTP Status Code
*
* @return string
* @throws \Exception
*/
- protected function formatContent($type, $data, $status)
+ protected function formatContent($type, $data, $httpCode)
{
switch ($type) {
case 'application/javascript':
- $output = compact('data', 'status');
+ $output = ['data' => $data];
if ('development' == APPLICATION_ENV && count(self::$php_errors) > 0) {
$output['php_errors'] = self::$php_errors;
}
return json_encode($output);
case 'text/plain':
- return $data ? $status . " $data" : $status;
+ return ((null !== $httpCode && $httpCode >= 400) ? 'ERROR ' : 'OK ')
+ . $data;
case 'text/html':
return $data ?: '';
default:
@@ -94,15 +95,13 @@ trait AjaxResponseTrait
*
* @param string $type Content type to output
* @param mixed $data The response data
- * @param string $status Status of the request
* @param int $httpCode A custom HTTP Status Code
*
* @return \Zend\Http\Response
* @throws \Exception
*/
- protected function getAjaxResponse($type, $data, $status = Ajax::STATUS_OK,
- $httpCode = null
- ) {
+ protected function getAjaxResponse($type, $data, $httpCode = null)
+ {
$response = $this->getResponse();
$headers = $response->getHeaders();
$headers->addHeaderLine('Content-type', $type);
@@ -111,7 +110,7 @@ trait AjaxResponseTrait
if ($httpCode !== null) {
$response->setStatusCode($httpCode);
}
- $response->setContent($this->formatContent($type, $data, $status));
+ $response->setContent($this->formatContent($type, $data, $httpCode));
return $response;
}
@@ -130,8 +129,7 @@ trait AjaxResponseTrait
return $this->getAjaxResponse(
$type,
$this->translate('An error has occurred') . $debugMsg,
- Ajax::STATUS_ERROR,
- 500
+ Ajax::STATUS_HTTP_ERROR
);
}
@@ -164,8 +162,7 @@ trait AjaxResponseTrait
return $this->getAjaxResponse(
$type,
$this->translate('Invalid Method'),
- Ajax::STATUS_ERROR,
- 400
+ Ajax::STATUS_HTTP_BAD_REQUEST
);
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CheckRequestIsValidTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CheckRequestIsValidTest.php
index a4813f79048127ee4abe7a79f123f2bcaa0d1ec9..17079e4996861705a9310830ca68779294fb03e8 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CheckRequestIsValidTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CheckRequestIsValidTest.php
@@ -86,7 +86,7 @@ class CheckRequestIsValidTest extends \VuFindTest\Unit\AjaxHandlerTest
{
$handler = $this->getHandler();
$this->assertEquals(
- ['You must be logged in first', 'NEED_AUTH', 401],
+ ['You must be logged in first', 401],
$handler->handleRequest($this->getParamsHelper(['id' => 1, 'data' => 1]))
);
}
@@ -100,7 +100,7 @@ class CheckRequestIsValidTest extends \VuFindTest\Unit\AjaxHandlerTest
{
$handler = $this->getHandler(null, null, null, $this->getMockUser());
$this->assertEquals(
- ['bulk_error_missing', 'ERROR', 400],
+ ['bulk_error_missing', 400],
$handler->handleRequest($this->getParamsHelper())
);
}
@@ -135,7 +135,7 @@ class CheckRequestIsValidTest extends \VuFindTest\Unit\AjaxHandlerTest
public function testHoldResponse()
{
$this->assertEquals(
- [['status' => true, 'msg' => 'request_place_text'], 'OK'],
+ [['status' => true, 'msg' => 'request_place_text']],
$this->runSuccessfulTest('checkRequestIsValid')
);
}
@@ -148,7 +148,7 @@ class CheckRequestIsValidTest extends \VuFindTest\Unit\AjaxHandlerTest
public function testILLResponse()
{
$this->assertEquals(
- [['status' => true, 'msg' => 'ill_request_place_text'], 'OK'],
+ [['status' => true, 'msg' => 'ill_request_place_text']],
$this->runSuccessfulTest('checkILLRequestIsValid', 'ILLRequest')
);
}
@@ -162,8 +162,7 @@ class CheckRequestIsValidTest extends \VuFindTest\Unit\AjaxHandlerTest
{
$this->assertEquals(
[
- ['status' => true, 'msg' => 'storage_retrieval_request_place_text'],
- 'OK'
+ ['status' => true, 'msg' => 'storage_retrieval_request_place_text']
], $this->runSuccessfulTest(
'checkStorageRetrievalRequestIsValid', 'StorageRetrievalRequest'
)
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CommentRecordTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CommentRecordTest.php
index e6d1b82bde5d288fc28455968b5c75532b3fe8e4..b2676de64988bab07e3cc74da0fe1c63735a8a66 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CommentRecordTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CommentRecordTest.php
@@ -117,7 +117,7 @@ class CommentRecordTest extends \VuFindTest\Unit\AjaxHandlerTest
{
$handler = $this->getHandler(null, null, false);
$this->assertEquals(
- ['Comments disabled', 'ERROR', 403],
+ ['Comments disabled', 400],
$handler->handleRequest($this->getParamsHelper())
);
}
@@ -131,7 +131,7 @@ class CommentRecordTest extends \VuFindTest\Unit\AjaxHandlerTest
{
$handler = $this->getHandler(null, null, true);
$this->assertEquals(
- ['You must be logged in first', 'NEED_AUTH', 401],
+ ['You must be logged in first', 401],
$handler->handleRequest($this->getParamsHelper())
);
}
@@ -145,7 +145,7 @@ class CommentRecordTest extends \VuFindTest\Unit\AjaxHandlerTest
{
$handler = $this->getHandler(null, null, true, $this->getMockUser());
$this->assertEquals(
- ['bulk_error_missing', 'ERROR', 400],
+ ['bulk_error_missing', 400],
$handler->handleRequest($this->getParamsHelper())
);
}
@@ -168,7 +168,9 @@ class CommentRecordTest extends \VuFindTest\Unit\AjaxHandlerTest
'comment' => 'bar',
];
$this->assertEquals(
- [true, 'OK'],
+ [
+ ['commentId' => true]
+ ],
$handler->handleRequest($this->getParamsHelper([], $post))
);
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/KeepAliveTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/KeepAliveTest.php
index 1f838cd8b404d64d1530d585a2e50447f561c16c..0fa748c52cfd2fb95060314c4a775af9ebe1d2aa 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/KeepAliveTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/KeepAliveTest.php
@@ -55,6 +55,6 @@ class KeepAliveTest extends \VuFindTest\Unit\AjaxHandlerTest
$factory = new KeepAliveFactory();
$handler = $factory($container, KeepAlive::class);
$params = new \Zend\Mvc\Controller\Plugin\Params();
- $this->assertEquals([true, 'OK'], $handler->handleRequest($params));
+ $this->assertEquals([true], $handler->handleRequest($params));
}
}
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/RecommendTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/RecommendTest.php
index 308b5f24a371f7fac2e4309f3f4e8b05d80ba52f..c6330d1f44af7f0928581896305d4153e16597a4 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/RecommendTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/RecommendTest.php
@@ -62,6 +62,6 @@ class RecommendTest extends \VuFindTest\Unit\AjaxHandlerTest
->will($this->returnValue($viewHelper));
$handler = new Recommend($ss, $rm, $r, $view);
$params = $this->getParamsHelper(['mod' => 'foo']);
- $this->assertEquals([null, 'OK'], $handler->handleRequest($params));
+ $this->assertEquals([null], $handler->handleRequest($params));
}
}
diff --git a/themes/bootstrap3/js/check_item_statuses.js b/themes/bootstrap3/js/check_item_statuses.js
index cd78ab044fad5e6221d93a01f3cf6eeafd0e697c..41d824798d6f39e88e8a14f6e4e64a4edd5921a7 100644
--- a/themes/bootstrap3/js/check_item_statuses.js
+++ b/themes/bootstrap3/js/check_item_statuses.js
@@ -93,9 +93,10 @@ function runItemAjaxForQueue() {
data: { 'id': itemStatusIds }
})
.done(function checkItemStatusDone(response) {
- for (var j = 0; j < response.data.length; j++) {
- displayItemStatus(response.data[j], itemStatusEls[response.data[j].id]);
- itemStatusIds.splice(itemStatusIds.indexOf(response.data[j].id), 1);
+ for (var j = 0; j < response.data.statuses.length; j++) {
+ var status = response.data.statuses[j];
+ displayItemStatus(status, itemStatusEls[status.id]);
+ itemStatusIds.splice(itemStatusIds.indexOf(status.id), 1);
}
itemStatusRunning = false;
})
diff --git a/themes/bootstrap3/js/check_save_statuses.js b/themes/bootstrap3/js/check_save_statuses.js
index 9bfe6741ad14ca4cad5d433850f1df9f4223bf84..02d4e5a2268d2928ce9f69bbabee5be6c9b69de0 100644
--- a/themes/bootstrap3/js/check_save_statuses.js
+++ b/themes/bootstrap3/js/check_save_statuses.js
@@ -55,9 +55,9 @@ function runSaveAjaxForQueue() {
}
})
.done(function checkSaveStatusDone(response) {
- for (var id in response.data) {
- if (response.data.hasOwnProperty(id)) {
- displaySaveStatus(response.data[id], saveStatusEls[id]);
+ for (var id in response.data.statuses) {
+ if (response.data.statuses.hasOwnProperty(id)) {
+ displaySaveStatus(response.data.statuses[id], saveStatusEls[id]);
}
// Remove populated ids from the queue
for (var j = 0; j < saveStatusObjs; j++) {
diff --git a/themes/bootstrap3/js/common.js b/themes/bootstrap3/js/common.js
index a3f978cadb4666535a98664cfbcd48e58089fd04..707461a01badbdab7d04ce5b915a95acf5460ed3 100644
--- a/themes/bootstrap3/js/common.js
+++ b/themes/bootstrap3/js/common.js
@@ -287,10 +287,10 @@ function setupAutocomplete() {
},
dataType: 'json',
success: function autocompleteJSON(json) {
- if (json.data.length > 0) {
+ if (json.data.suggestions.length > 0) {
var datums = [];
- for (var j = 0; j < json.data.length; j++) {
- datums.push(json.data[j]);
+ for (var j = 0; j < json.data.suggestions.length; j++) {
+ datums.push(json.data.suggestions[j]);
}
cb(datums);
} else {
diff --git a/themes/bootstrap3/js/embedded_record.js b/themes/bootstrap3/js/embedded_record.js
index 596729e83ba87219cd209593e7b955a6857705e5..6d39891392f0de0f7f1439c80097e8a81dafea0a 100644
--- a/themes/bootstrap3/js/embedded_record.js
+++ b/themes/bootstrap3/js/embedded_record.js
@@ -136,44 +136,42 @@ VuFind.register('embedded', function embedded() {
source: result.find('.hiddenSource')[0].value
}),
success: function getRecordDetailsSuccess(response) {
- if (response.status === 'OK') {
- // Insert tabs html
- longNode.html(response.data);
- // Hide loading
- loadingNode.addClass('hidden');
- longNode.collapse('show');
- // Load first tab
- if (tabid) {
- ajaxLoadTab(tabid, true);
- } else {
- var $firstTab = $(longNode).find('.list-tab-toggle.active');
- if ($firstTab.length === 0) {
- $firstTab = $(longNode).find('.list-tab-toggle:eq(0)');
- }
- ajaxLoadTab($firstTab.attr('id'), true);
+ // Insert tabs html
+ longNode.html(response.data.html);
+ // Hide loading
+ loadingNode.addClass('hidden');
+ longNode.collapse('show');
+ // Load first tab
+ if (tabid) {
+ ajaxLoadTab(tabid, true);
+ } else {
+ var $firstTab = $(longNode).find('.list-tab-toggle.active');
+ if ($firstTab.length === 0) {
+ $firstTab = $(longNode).find('.list-tab-toggle:eq(0)');
}
- // Bind tab clicks
- longNode.find('.list-tab-toggle').click(function embeddedTabLoad() {
- if (!$(this).parent().hasClass('noajax')) {
- addToStorage(divID, this.id);
- }
- return ajaxLoadTab(this.id);
- });
- longNode.find('[id^=usercomment]').find('input[type=submit]').unbind('click').click(
- function embeddedComments() {
- return registerAjaxCommentRecord(
- longNode.find('[id^=usercomment]').find('input[type=submit]').closest('form')
- );
- }
- );
- longNode.find('[data-background]').each(function setupEmbeddedBackgroundTabs(index, el) {
- ajaxLoadTab(el.id, false);
- });
- // Add events to record toolbar
- VuFind.lightbox.bind(longNode);
- if (typeof checkSaveStatuses == 'function') {
- checkSaveStatuses(longNode);
+ ajaxLoadTab($firstTab.attr('id'), true);
+ }
+ // Bind tab clicks
+ longNode.find('.list-tab-toggle').click(function embeddedTabLoad() {
+ if (!$(this).parent().hasClass('noajax')) {
+ addToStorage(divID, this.id);
+ }
+ return ajaxLoadTab(this.id);
+ });
+ longNode.find('[id^=usercomment]').find('input[type=submit]').unbind('click').click(
+ function embeddedComments() {
+ return registerAjaxCommentRecord(
+ longNode.find('[id^=usercomment]').find('input[type=submit]').closest('form')
+ );
}
+ );
+ longNode.find('[data-background]').each(function setupEmbeddedBackgroundTabs(index, el) {
+ ajaxLoadTab(el.id, false);
+ });
+ // Add events to record toolbar
+ VuFind.lightbox.bind(longNode);
+ if (typeof checkSaveStatuses == 'function') {
+ checkSaveStatuses(longNode);
}
}
});
diff --git a/themes/bootstrap3/js/facets.js b/themes/bootstrap3/js/facets.js
index f2029227e044dfef87e7e74bf9176f61b624c2d8..3b9ea5dcd576aa99b16307366bba6c6676988788 100644
--- a/themes/bootstrap3/js/facets.js
+++ b/themes/bootstrap3/js/facets.js
@@ -109,26 +109,24 @@ function initFacetTree(treeNode, inSidebar)
facetOperator: operator
},
function getFacetData(response/*, textStatus*/) {
- if (response.status === "OK") {
- var results = buildFacetNodes(response.data, currentPath, allowExclude, excludeTitle, inSidebar);
- treeNode.find('.fa-spinner').parent().remove();
- if (inSidebar) {
- treeNode.on('loaded.jstree open_node.jstree', function treeNodeOpen(/*e, data*/) {
- treeNode.find('ul.jstree-container-ul > li.jstree-node').addClass('list-group-item');
- treeNode.find('a.exclude').click(function excludeLinkClick(e) {
- $(this).closest('.collapse').html('<div class="facet">' + VuFind.translate('loading') + '...</div>');
- window.location = this.href;
- e.preventDefault();
- return false;
- });
+ var results = buildFacetNodes(response.data.facets, currentPath, allowExclude, excludeTitle, inSidebar);
+ treeNode.find('.fa-spinner').parent().remove();
+ if (inSidebar) {
+ treeNode.on('loaded.jstree open_node.jstree', function treeNodeOpen(/*e, data*/) {
+ treeNode.find('ul.jstree-container-ul > li.jstree-node').addClass('list-group-item');
+ treeNode.find('a.exclude').click(function excludeLinkClick(e) {
+ $(this).closest('.collapse').html('<div class="facet">' + VuFind.translate('loading') + '...</div>');
+ window.location = this.href;
+ e.preventDefault();
+ return false;
});
- }
- treeNode.jstree({
- 'core': {
- 'data': results
- }
});
}
+ treeNode.jstree({
+ 'core': {
+ 'data': results
+ }
+ });
}
);
}
diff --git a/themes/bootstrap3/js/openurl.js b/themes/bootstrap3/js/openurl.js
index 8056d7df8c3f8ad43a2852e332f169ccfb2c4c86..270bfebc0a6f06bc8fd5ac42bfa5af51164a8fe4 100644
--- a/themes/bootstrap3/js/openurl.js
+++ b/themes/bootstrap3/js/openurl.js
@@ -12,7 +12,7 @@ VuFind.register('openurl', function OpenUrl() {
url: url
})
.done(function getResolverLinksDone(response) {
- $target.removeClass('ajax_availability').empty().append(response.data);
+ $target.removeClass('ajax_availability').empty().append(response.data.html);
})
.fail(function getResolverLinksFail(response, textStatus) {
$target.removeClass('ajax_availability').addClass('text-danger').empty();
diff --git a/themes/bootstrap3/js/pubdate_vis.js b/themes/bootstrap3/js/pubdate_vis.js
index ca0dbd7317cf9e1e6dc18cdeaae154c98fb64bd2..91aec13a876253707d7d714d6658fd9304e6c034 100644
--- a/themes/bootstrap3/js/pubdate_vis.js
+++ b/themes/bootstrap3/js/pubdate_vis.js
@@ -55,7 +55,7 @@ function loadVis(facetFields, searchParams, baseURL, zooming) {
var url = baseURL + '/AJAX/json?method=getVisData&facetFields=' + encodeURIComponent(facetFields) + '&' + searchParams;
$.getJSON(url, function getVisDataJSON(data) {
- $.each(data.data, function getVisDataEach(key, val) {
+ $.each(data.data.facets, function getVisDataEach(key, val) {
//check if there is data to display, if there isn't hide the box
if (val.data === undefined || val.data.length === 0) {
return;
diff --git a/themes/bootstrap3/js/record.js b/themes/bootstrap3/js/record.js
index 1a6a5d0baa6a2b0d87c4826f114de15bb4e612f3..8226d48dbe123b09f0a2a58ecc4702ea9a28a31c 100644
--- a/themes/bootstrap3/js/record.js
+++ b/themes/bootstrap3/js/record.js
@@ -71,7 +71,7 @@ function refreshCommentList($target, recordId, recordSource) {
// Update HTML
var $commentList = $target.find('.comment-list');
$commentList.empty();
- $commentList.append(response.data);
+ $commentList.append(response.data.html);
$commentList.find('.delete').unbind('click').click(function commentRefreshDeleteClick() {
var commentId = $(this).attr('id').substr('recordComment'.length);
deleteRecordComment(this, recordId, recordSource, commentId);
@@ -203,7 +203,7 @@ function refreshTagList(_target, _loggedin) {
})
.done(function getRecordTagsDone(response) {
$tagList.empty();
- $tagList.replaceWith(response.data);
+ $tagList.replaceWith(response.data.html);
if (loggedin) {
$tagList.addClass('loggedin');
} else {
diff --git a/themes/bootstrap3/js/relais.js b/themes/bootstrap3/js/relais.js
index a34d89d2467df70424a97212fc0c4fa94044592b..0524c1750f912fe43bbab69ba39deb825f8c5a99 100644
--- a/themes/bootstrap3/js/relais.js
+++ b/themes/bootstrap3/js/relais.js
@@ -22,7 +22,7 @@ VuFind.register('relais', function Relais() {
dataType: 'json',
url: url,
success: function checkAvailabilitySuccessCallback(response) {
- if (response.data === "ok") {
+ if (response.data.result === "ok") {
$("span[class='relaisLink']").each(function linkFormatter() {
var $current = $(this);
var text = VuFind.translate('relais_request');
@@ -38,7 +38,7 @@ VuFind.register('relais', function Relais() {
}
function cancelRequestOnClick() {
- $('#modal').modal('hide'); // hide the modal
+ $('#modal').modal('hide'); // hide the modal
$('#modal-dynamic-content').empty(); // empties dynamic content
$('.modal-backdrop').remove(); // removes all modal-backdrops
}
@@ -57,14 +57,10 @@ VuFind.register('relais', function Relais() {
dataType: 'json',
url: url,
success: function makeRequestSuccessCallback(response) {
- if (response.status === "ERROR") {
- errorCallback(failLink);
- } else {
- var obj = jQuery.parseJSON(response.data);
- $('#requestButton').html("<input class='btn btn-primary' data-dismiss='modal' id='cancelRelaisRequest' type='submit' value='" + VuFind.translate('close') + "'>");
- $('#requestMessage').html("<b>" + VuFind.translate('relais_success_label') + "</b> " + VuFind.translate('relais_success_message', {'%%id%%': obj.RequestNumber}));
- $('#cancelRelaisRequest').unbind('click').click(cancelRequestOnClick);
- }
+ var obj = jQuery.parseJSON(response.data.result);
+ $('#requestButton').html("<input class='btn btn-primary' data-dismiss='modal' id='cancelRelaisRequest' type='submit' value='" + VuFind.translate('close') + "'>");
+ $('#requestMessage').html("<b>" + VuFind.translate('relais_success_label') + "</b> " + VuFind.translate('relais_success_message', {'%%id%%': obj.RequestNumber}));
+ $('#cancelRelaisRequest').unbind('click').click(cancelRequestOnClick);
},
error: function makeRequestErrorWrapper() { errorCallback(failLink); }
});
@@ -79,7 +75,7 @@ VuFind.register('relais', function Relais() {
dataType: 'json',
url: url,
success: function infoSuccessCallback(response) {
- var obj = response.status === "ERROR" ? false : jQuery.parseJSON(response.data);
+ var obj = jQuery.parseJSON(response.data.result);
if (obj && obj.Available) {
$('#requestMessage').html(VuFind.translate('relais_available'));
$('#requestButton').html(
diff --git a/themes/bootstrap3/templates/ContentBlock/IlsStatusMonitor.phtml b/themes/bootstrap3/templates/ContentBlock/IlsStatusMonitor.phtml
index 43448ad2d149bae44f05074e90658b7fd2934c57..36d97c56bcd8d0a14d695f8dabf59f3dbe645554 100644
--- a/themes/bootstrap3/templates/ContentBlock/IlsStatusMonitor.phtml
+++ b/themes/bootstrap3/templates/ContentBlock/IlsStatusMonitor.phtml
@@ -7,7 +7,7 @@ $(document).ready(function() {
data: {'offlineModeMsg':'ils_offline_home_message'},
url: VuFind.path + '/AJAX/JSON?method=getIlsStatus',
success: function(response) {
- $('{$target}').prepend(response.data);
+ $('{$target}').prepend(response.data.html);
}
});
});