post review changes

MerginMaps · Jan 13, 2025 · 4a6deda · 4a6deda · inputapp-bot · Jan 13, 2025
1 parent 493bb18
commit 4a6deda
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/app/activeproject.cpp b/app/activeproject.cpp
@@ -87,6 +87,13 @@ ActiveProject::ActiveProject( AppSettings &appSettings
       setProjectRole( role );
     }
   } );
+
+  QObject::connect(
+    mMerginApi,
+    &MerginApi::authChanged,
+    this,
+    &ActiveProject::updateUserRoleInActiveProject
+  );
 }
 
 ActiveProject::~ActiveProject() = default;
@@ -585,6 +592,6 @@ void ActiveProject::setProjectRole( const QString &role )
 
 void ActiveProject::updateUserRoleInActiveProject()
 {
-  // update user's role each time a project is opened, following #3174
+  // update user's role each time a project is opened or auth changes, following #3174
   mMerginApi->updateProjectMetadataRole( projectFullName() );
 }
diff --git a/app/activeproject.h b/app/activeproject.h
@@ -131,7 +131,7 @@ class ActiveProject: public QObject
     /**
      * Calls Mergin API to update current project’s role
      */
-    void updateUserRoleInActiveProject();
+    Q_INVOKABLE void updateUserRoleInActiveProject();
 
   signals:
     void qgsProjectChanged();

diff --git a/app/qml/project/MMProjectController.qml b/app/qml/project/MMProjectController.qml
@@ -48,8 +48,6 @@ Item {
   function setupProjectOpen( projectPath ) {
     if ( projectPath === __activeProject.localProject.qgisProjectFilePath )
     {
-      // update user's role in project ( in case user has changed )
-      __activeProject.updateUserRoleInActiveProject()
       // just hide the panel - project already loaded
       hidePanel()
     }

diff --git a/core/merginprojectmetadata.h b/core/merginprojectmetadata.h
@@ -60,7 +60,6 @@ struct MerginProjectMetadata
   QString name;
   QString projectNamespace;
   QString role;
-  QList<QString> writersnames;
   int version = -1;
   QList<MerginFile> files;
   QString projectId; //!< unique project ID (only available in API that supports project IDs)