ensuring user role is cached/updated each time we open a project

MerginMaps · Dec 10, 2024 · 6596705 · 6596705
1 parent eabfc85
commit 6596705
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/app/activeproject.cpp b/app/activeproject.cpp
@@ -113,9 +113,6 @@ bool ActiveProject::load( const QString &filePath )
 
 bool ActiveProject::forceLoad( const QString &filePath, bool force )
 {
-  // update user's role each time a project is opened, following #3174
-  mMerginApi->updateProjectMetadataRole( projectFullName() );
-
   CoreUtils::log( QStringLiteral( "Project loading" ), filePath + " " + ( force ? "true" : "false" ) );
 
   // clear autosync
@@ -204,6 +201,7 @@ bool ActiveProject::forceLoad( const QString &filePath, bool force )
     updateRecordingLayers();
     updateActiveLayer();
     updateMapSettingsLayers();
+    updateUserRoleInActiveProject();
 
     emit localProjectChanged( mLocalProject );
     emit projectReloaded( mQgsProject );
@@ -588,3 +586,9 @@ void ActiveProject::setProjectRole( const QString &role )
     emit projectRoleChanged();
   }
 }
+
+void ActiveProject::updateUserRoleInActiveProject()
+{
+  // update user's role each time a project is opened, following #3174
+  mMerginApi->updateProjectMetadataRole( projectFullName() );
+}
diff --git a/app/activeproject.h b/app/activeproject.h
@@ -128,6 +128,11 @@ class ActiveProject: public QObject
 
     void setProjectRole( const QString &role );
 
+    /**
+     * Calls Mergin API to update current project’s role
+     */
+    void updateUserRoleInActiveProject();
+
   signals:
     void qgsProjectChanged();
     void localProjectChanged( LocalProject project );

diff --git a/app/qml/project/MMProjectController.qml b/app/qml/project/MMProjectController.qml
@@ -48,10 +48,10 @@ 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()
-      // update user's role in project ( in case user has changed )
-      __merginApi.updateProjectMetadataRole( __activeProject.projectFullName() )
     }
     else
     {