Alamantus
/
Lexiconga
mirror of https://github.com/Alamantus/Lexiconga.git
1
0
Fork 0
Code Issues Releases Activity

Add additional messaging to delete-words error

This commit is contained in:
Robbie Antenesse 2019-05-23 15:07:31 -06:00
parent 7c3724f22e
commit aee0f81d3c
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/php/api/Dictionary.php
View File

@ -301,8 +301,10 @@ created_on=VALUES(created_on)';
$insert_results = $this->db->execute($insert_query, $insert_params); $insert_results = $this->db->execute($insert_query, $insert_params);
if ($insert_results) { if ($insert_results) {
$delete_results = $this->db->execute($delete_query, $delete_params); $delete_results = $this->db->execute($delete_query, $delete_params);
if ($delete_results) {
return $delete_results; return $delete_results;
} }
return $insert_results; }
return $this->db->last_error_info;
} }
} }

9
src/php/api/User.php
View File

@ -228,10 +228,13 @@ VALUES (?, ?, ?, ?, ?)';
if ($user_data !== false) { if ($user_data !== false) {
$dictionary = $user_data->dictionary; $dictionary = $user_data->dictionary;
$user = $user_data->id; $user = $user_data->id;
$deleted_word = $this->dictionary->deleteWords($dictionary, $word_ids); $deleted_words = $this->dictionary->deleteWords($dictionary, $word_ids);
if ($deleted_word) { if ($deleted_words === true) {
return true; return $deleted_words;
} }
return array(
'error' => $deleted_words,
);
} }
return false; return false;
} }

14
src/php/api/index.php
View File

@ -292,15 +292,21 @@ switch ($action) {
), 400); ), 400);
} }
case 'delete-words': { case 'delete-words': {
if ($token !== false && isset($request['words'])) { if ($token !== false && isset($request['wordIds'])) {
$user = new User(); $user = new User();
$delete_word_success = $user->deleteWordsFromCurrentDictionary($token, $request['words']); $delete_words_success = $user->deleteWordsFromCurrentDictionary($token, $request['wordIds']);
if ($delete_word_success !== false) { if ($delete_words_success === true) {
return Response::json(array( return Response::json(array(
'data' => 'Deleted successfully', 'data' => $delete_words_success,
'error' => false, 'error' => false,
), 200); ), 200);
} }
if (isset($delete_words_success['error'])) {
return Response::json(array(
'data' => $delete_words_success['error'],
'error' => true,
), 500);
}
return Response::json(array( return Response::json(array(
'data' => 'Could not delete words: invalid token', 'data' => 'Could not delete words: invalid token',
'error' => true, 'error' => true,