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

Fix mistake that prevented last_updated from being set

This commit is contained in:
Robbie Antenesse 2020-03-03 20:59:20 -07:00
parent a9ae7f938c
commit ed9eba7137
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/js/account/sync.js
View File

@ -174,10 +174,11 @@ export function syncWords(remoteWords, deletedWords) {
} }
remoteWords.forEach(remoteWord => { remoteWords.forEach(remoteWord => {
let localWord = words.find(word => word.wordId === remoteWord.wordId); const localWordIndex = words.findIndex(word => word.wordId === remoteWord.wordId);
const localWord = words[localWordIndex];
if (localWord) { if (localWord) {
if (localWord.lastUpdated < remoteWord.lastUpdated) { if (localWord.lastUpdated < remoteWord.lastUpdated) {
localWord = remoteWord; words[localWordIndex] = remoteWord;
} else if (localWord.lastUpdated > remoteWord.lastUpdated) { } else if (localWord.lastUpdated > remoteWord.lastUpdated) {
// Add more-recently-updated words to upload // Add more-recently-updated words to upload
localWordsToUpload.push(localWord); localWordsToUpload.push(localWord);

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

@ -258,7 +258,7 @@ WHERE dictionary=$dictionary";
$word_ids = array(); $word_ids = array();
$most_recent_word_update = 0; $most_recent_word_update = 0;
foreach($words as $word) { foreach($words as $word) {
$last_updated = isset($word['lastUpdated']) ? $word['createdOn'] : $word['lastUpdated']; $last_updated = isset($word['lastUpdated']) ? $word['lastUpdated'] : $word['createdOn'];
if ($most_recent_word_update < $last_updated) { if ($most_recent_word_update < $last_updated) {
$most_recent_word_update = $last_updated; $most_recent_word_update = $last_updated;
} }