Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorClaudio Cambra <claudio.cambra@nextcloud.com>2022-10-06 14:21:33 +0300
committerClaudio Cambra <claudio.cambra@nextcloud.com>2022-10-31 20:06:09 +0300
commite021f256345564193ebde2857903eaa5462cf5d1 (patch)
tree2cfb6722aa4ef3be3d7d8bc7842c4d5ba34a40c5 /src
parent77fb0c4808d41440ef85ac93f6d21eef16a975d7 (diff)
Add a suite of tests for ShareModel
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com> Test ShareModel error handling Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com> Improve testing of user/group shares in ShareModel Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com> Add testing for maximum share expire date enforcement in ShareModel Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/filedetails/sharemodel.cpp7
-rw-r--r--src/gui/folderman.h2
-rw-r--r--src/gui/sharemanager.cpp1
-rw-r--r--src/gui/sharepermissions.h2
4 files changed, 10 insertions, 2 deletions
diff --git a/src/gui/filedetails/sharemodel.cpp b/src/gui/filedetails/sharemodel.cpp
index 19e603b23..fdf2b28de 100644
--- a/src/gui/filedetails/sharemodel.cpp
+++ b/src/gui/filedetails/sharemodel.cpp
@@ -196,6 +196,7 @@ void ShareModel::resetData()
_hasInitialShareFetchCompleted = false;
_sharees.clear();
+ Q_EMIT sharePermissionsChanged();
Q_EMIT fetchOngoingChanged();
Q_EMIT hasInitialShareFetchCompletedChanged();
Q_EMIT shareesChanged();
@@ -362,8 +363,10 @@ void ShareModel::slotPropfindReceived(const QVariantMap &result)
void ShareModel::slotSharesFetched(const QList<SharePtr> &shares)
{
- _hasInitialShareFetchCompleted = true;
- Q_EMIT hasInitialShareFetchCompletedChanged();
+ if(!_hasInitialShareFetchCompleted) {
+ _hasInitialShareFetchCompleted = true;
+ Q_EMIT hasInitialShareFetchCompletedChanged();
+ }
qCInfo(lcSharing) << "Fetched" << shares.count() << "shares";
diff --git a/src/gui/folderman.h b/src/gui/folderman.h
index bf7a8e8c8..8cc499cd8 100644
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -27,6 +27,7 @@
class TestFolderMan;
class TestCfApiShellExtensionsIPC;
+class TestShareModel;
namespace OCC {
@@ -379,6 +380,7 @@ private:
friend class OCC::Application;
friend class ::TestFolderMan;
friend class ::TestCfApiShellExtensionsIPC;
+ friend class ::TestShareModel;
};
} // namespace OCC
diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp
index 7a264557d..621ab6c47 100644
--- a/src/gui/sharemanager.cpp
+++ b/src/gui/sharemanager.cpp
@@ -478,6 +478,7 @@ void ShareManager::fetchShares(const QString &path)
void ShareManager::slotSharesFetched(const QJsonDocument &reply)
{
+ qDebug() << reply;
auto tmpShares = reply.object().value("ocs").toObject().value("data").toArray();
const QString versionString = _account->serverVersion();
qCDebug(lcSharing) << versionString << "Fetched" << tmpShares.count() << "shares";
diff --git a/src/gui/sharepermissions.h b/src/gui/sharepermissions.h
index 92ce95766..28028e9dd 100644
--- a/src/gui/sharepermissions.h
+++ b/src/gui/sharepermissions.h
@@ -35,4 +35,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(SharePermissions)
} // namespace OCC
+Q_DECLARE_METATYPE(OCC::SharePermission)
+
#endif