Skip to content
Snippets Groups Projects
Commit f16fcfad authored by Chris Hallberg's avatar Chris Hallberg
Browse files

Reduce errors from arrays to strings. Error code translations.

parent 73e0f58c
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
module/VuFind/src/VuFind/Controller/AjaxController.php
+ 140
− 127
View file @ f16fcfad
...@@ -895,68 +895,70 @@ class AjaxController extends AbstractBase ...@@ -895,68 +895,70 @@ class AjaxController extends AbstractBase
$id = $this->params()->fromQuery('id'); $id = $this->params()->fromQuery('id');
$data = $this->params()->fromQuery('data'); $data = $this->params()->fromQuery('data');
$requestType = $this->params()->fromQuery('requestType'); $requestType = $this->params()->fromQuery('requestType');
if (!empty($id) && !empty($data)) { if (empty($id) || empty($data)) {
// check if user is logged in return $this->output(
$user = $this->getUser(); $this->translate('bulk_error_missing'),
if (!$user) { self::STATUS_ERROR,
return $this->output( 400
[ );
'status' => false, }
'msg' => $this->translate('You must be logged in first') // check if user is logged in
], $user = $this->getUser();
self::STATUS_NEED_AUTH, if (!$user) {
401 return $this->output(
); $this->translate('You must be logged in first'),
} self::STATUS_NEED_AUTH,
401
);
}
try { try {
$catalog = $this->getILS(); $catalog = $this->getILS();
$patron = $this->getILSAuthenticator()->storedCatalogLogin(); $patron = $this->getILSAuthenticator()->storedCatalogLogin();
if ($patron) { if ($patron) {
switch ($requestType) { switch ($requestType) {
case 'ILLRequest': case 'ILLRequest':
$results = $catalog->checkILLRequestIsValid( $results = $catalog->checkILLRequestIsValid(
$id, $data, $patron $id, $data, $patron
); );
$msg = $results $msg = $results
? $this->translate( ? $this->translate(
'ill_request_place_text' 'ill_request_place_text'
) )
: $this->translate( : $this->translate(
'ill_request_error_blocked' 'ill_request_error_blocked'
);
break;
case 'StorageRetrievalRequest':
$results = $catalog->checkStorageRetrievalRequestIsValid(
$id, $data, $patron
); );
break;
case 'StorageRetrievalRequest':
$results = $catalog->checkStorageRetrievalRequestIsValid(
$id, $data, $patron
);
$msg = $results $msg = $results
? $this->translate( ? $this->translate(
'storage_retrieval_request_place_text' 'storage_retrieval_request_place_text'
) )
: $this->translate( : $this->translate(
'storage_retrieval_request_error_blocked' 'storage_retrieval_request_error_blocked'
);
break;
default:
$results = $catalog->checkRequestIsValid(
$id, $data, $patron
); );
break;
$msg = $results default:
? $this->translate('request_place_text') $results = $catalog->checkRequestIsValid(
: $this->translate('hold_error_blocked'); $id, $data, $patron
break;
}
return $this->output(
['status' => $results, 'msg' => $msg], self::STATUS_OK
); );
$msg = $results
? $this->translate('request_place_text')
: $this->translate('hold_error_blocked');
break;
} }
} catch (\Exception $e) { return $this->output(
// Do nothing -- just fail through to the error message below. ['status' => $results, 'msg' => $msg], self::STATUS_OK
);
} }
} catch (\Exception $e) {
// Do nothing -- just fail through to the error message below.
} }
return $this->output( return $this->output(
...@@ -984,7 +986,9 @@ class AjaxController extends AbstractBase ...@@ -984,7 +986,9 @@ class AjaxController extends AbstractBase
$comment = $this->params()->fromPost('comment'); $comment = $this->params()->fromPost('comment');
if (empty($id) || empty($comment)) { if (empty($id) || empty($comment)) {
return $this->output( return $this->output(
$this->translate('An error has occurred'), self::STATUS_ERROR, 400 $this->translate('bulk_error_missing'),
self::STATUS_ERROR,
400
); );
} }
...@@ -1016,13 +1020,17 @@ class AjaxController extends AbstractBase ...@@ -1016,13 +1020,17 @@ class AjaxController extends AbstractBase
$id = $this->params()->fromQuery('id'); $id = $this->params()->fromQuery('id');
if (empty($id)) { if (empty($id)) {
return $this->output( return $this->output(
$this->translate('An error has occurred'), self::STATUS_ERROR, 400 $this->translate('bulk_error_missing'),
self::STATUS_ERROR,
400
); );
} }
$table = $this->getTable('Comments'); $table = $this->getTable('Comments');
if (!$table->deleteIfOwnedByUser($id, $user)) { if (!$table->deleteIfOwnedByUser($id, $user)) {
return $this->output( return $this->output(
$this->translate('An error has occurred'), self::STATUS_ERROR, 403 $this->translate('edit_list_fail'),
self::STATUS_ERROR,
405
); );
} }
...@@ -1169,43 +1177,45 @@ class AjaxController extends AbstractBase ...@@ -1169,43 +1177,45 @@ class AjaxController extends AbstractBase
$this->writeSession(); // avoid session write timing bug $this->writeSession(); // avoid session write timing bug
$id = $this->params()->fromQuery('id'); $id = $this->params()->fromQuery('id');
$pickupLib = $this->params()->fromQuery('pickupLib'); $pickupLib = $this->params()->fromQuery('pickupLib');
if (!empty($id) && !empty($pickupLib)) { if (empty($id) || empty($pickupLib)) {
// check if user is logged in return $this->output(
$user = $this->getUser(); $this->translate('bulk_error_missing'),
if (!$user) { self::STATUS_ERROR,
return $this->output( 400
[ );
'status' => false, }
'msg' => $this->translate('You must be logged in first') // check if user is logged in
], $user = $this->getUser();
self::STATUS_NEED_AUTH, if (!$user) {
401 return $this->output(
); $this->translate('You must be logged in first'),
} self::STATUS_NEED_AUTH,
401
);
}
try { try {
$catalog = $this->getILS(); $catalog = $this->getILS();
$patron = $this->getILSAuthenticator()->storedCatalogLogin(); $patron = $this->getILSAuthenticator()->storedCatalogLogin();
if ($patron) { if ($patron) {
$results = $catalog->getILLPickupLocations( $results = $catalog->getILLPickupLocations(
$id, $pickupLib, $patron $id, $pickupLib, $patron
); );
foreach ($results as &$result) { foreach ($results as &$result) {
if (isset($result['name'])) { if (isset($result['name'])) {
$result['name'] = $this->translate( $result['name'] = $this->translate(
'location_' . $result['name'], 'location_' . $result['name'],
[], [],
$result['name'] $result['name']
); );
}
} }
return $this->output(
['locations' => $results], self::STATUS_OK
);
} }
} catch (\Exception $e) { return $this->output(
// Do nothing -- just fail through to the error message below. ['locations' => $results], self::STATUS_OK
);
} }
} catch (\Exception $e) {
// Do nothing -- just fail through to the error message below.
} }
return $this->output( return $this->output(
...@@ -1223,49 +1233,52 @@ class AjaxController extends AbstractBase ...@@ -1223,49 +1233,52 @@ class AjaxController extends AbstractBase
$this->writeSession(); // avoid session write timing bug $this->writeSession(); // avoid session write timing bug
$id = $this->params()->fromQuery('id'); $id = $this->params()->fromQuery('id');
$requestGroupId = $this->params()->fromQuery('requestGroupId'); $requestGroupId = $this->params()->fromQuery('requestGroupId');
if (!empty($id) && !empty($requestGroupId)) { if (empty($id) || empty($requestGroupId)) {
// check if user is logged in return $this->output(
$user = $this->getUser(); $this->translate('bulk_error_missing'),
if (!$user) { self::STATUS_ERROR,
return $this->output( 400
[ );
'status' => false, }
'msg' => $this->translate('You must be logged in first') // check if user is logged in
], $user = $this->getUser();
self::STATUS_NEED_AUTH, if (!$user) {
401 return $this->output(
); $this->translate('You must be logged in first'),
} self::STATUS_NEED_AUTH,
401
);
}
try { try {
$catalog = $this->getILS(); $catalog = $this->getILS();
$patron = $this->getILSAuthenticator()->storedCatalogLogin(); $patron = $this->getILSAuthenticator()->storedCatalogLogin();
if ($patron) { if ($patron) {
$details = [ $details = [
'id' => $id, 'id' => $id,
'requestGroupId' => $requestGroupId 'requestGroupId' => $requestGroupId
]; ];
$results = $catalog->getPickupLocations( $results = $catalog->getPickupLocations(
$patron, $details $patron, $details
); );
foreach ($results as &$result) { foreach ($results as &$result) {
if (isset($result['locationDisplay'])) { if (isset($result['locationDisplay'])) {
$result['locationDisplay'] = $this->translate( $result['locationDisplay'] = $this->translate(
'location_' . $result['locationDisplay'], 'location_' . $result['locationDisplay'],
[], [],
$result['locationDisplay'] $result['locationDisplay']
); );
}
} }
return $this->output(
['locations' => $results], self::STATUS_OK
);
} }
} catch (\Exception $e) { return $this->output(
// Do nothing -- just fail through to the error message below. ['locations' => $results], self::STATUS_OK
);
} }
} catch (\Exception $e) {
// Do nothing -- just fail through to the error message below.
} }
return $this->output( return $this->output(
$this->translate('An error has occurred'), self::STATUS_ERROR, 500 $this->translate('An error has occurred'), self::STATUS_ERROR, 500
); );
......
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