self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Get it working with deleted items

Browse Source
This commit is contained in:
Laurent Cozic 2017-01-09 22:14:32 +01:00
parent 28320ace18
commit 11115077d5
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
QtClient/JoplinQtClient/models/foldermodel.cpp
View File

@ -155,14 +155,14 @@ void FolderModel::deleteData(const int index) {
Folder folder = atIndex(index); Folder folder = atIndex(index);
if (!folder.dispose()) return; if (!folder.dispose()) return;
cache_.clear(); // cache_.clear();
beginRemoveRows(QModelIndex(), index, index); // beginRemoveRows(QModelIndex(), index, index);
endRemoveRows(); // endRemoveRows();
QVector<int> roles; // QVector<int> roles;
roles << Qt::DisplayRole; // roles << Qt::DisplayRole;
emit dataChanged(this->index(0), this->index(rowCount() - 1), roles); // emit dataChanged(this->index(0), this->index(rowCount() - 1), roles);
} }
// TODO: instead of clearing the whole cache every time, the individual items // TODO: instead of clearing the whole cache every time, the individual items
@ -173,9 +173,6 @@ void FolderModel::dispatcher_folderCreated(const QString &folderId) {
cache_.clear(); cache_.clear();
// int index = idToIndex(folderId);
// Folder folder = atIndex(index);
int from = 0; int from = 0;
int to = rowCount() - 1; int to = rowCount() - 1;
@ -198,11 +195,16 @@ void FolderModel::dispatcher_folderUpdated(const QString &folderId) {
QVector<int> roles; QVector<int> roles;
roles << Qt::DisplayRole; roles << Qt::DisplayRole;
emit dataChanged(this->index(0), this->index(rowCount() - 1), roles); emit dataChanged(this->index(0), this->index(rowCount() - 1), roles);
//synchronizerTimer_.start(1000 * 3);
} }
void FolderModel::dispatcher_folderDeleted(const QString &folderId) { void FolderModel::dispatcher_folderDeleted(const QString &folderId) {
qDebug() << "FolderModel Folder deleted" << folderId; qDebug() << "FolderModel Folder deleted" << folderId;
//synchronizerTimer_.start(1000 * 3);
int index = idToIndex(folderId);
if (index < 0) return;
cache_.clear();
beginRemoveRows(QModelIndex(), index, index);
endRemoveRows();
} }

6
QtClient/JoplinQtClient/synchronizer.cpp
View File

@ -225,6 +225,12 @@ void Synchronizer::api_requestDone(const QJsonObject& response, const QString& t
folder.patchJsonObject(item); folder.patchJsonObject(item);
folder.save(false); folder.save(false);
} }
if (operationType == "delete") {
Folder folder;
folder.load(itemId);
folder.dispose();
}
} }
if (revId > maxRevId) maxRevId = revId; if (revId > maxRevId) maxRevId = revId;