MerginMaps · MarcelGeo · Mar 6, 2025 · Mar 4, 2025 · Mar 4, 2025 · Mar 4, 2025
diff --git a/server/mergin/version.py b/server/mergin/version.py
@@ -4,4 +4,4 @@
 
 
 def get_version():
-    return "2025.2.0"
+    return "2025.2.1"
diff --git a/server/setup.py b/server/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name="mergin",
-    version="2025.2.0",
+    version="2025.2.1",
     url="https://github.com/MerginMaps/mergin",
     license="AGPL-3.0-only",
     author="Lutra Consulting Limited",

diff --git a/web-app/packages/admin-app/src/router.ts b/web-app/packages/admin-app/src/router.ts
@@ -33,7 +33,7 @@ import { LoginView } from './modules/user'
 
 export const createRouter = (pinia: Pinia) => {
   const router = createRouterInstance({
-    history: createWebHistory(),
+    history: createWebHistory(import.meta.env.BASE_URL),
     routes: [
       {
         path: '/:pathMatch(.*)*',

diff --git a/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue b/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue
@@ -49,7 +49,7 @@ const settingsItems = ref<AppSettingsItemConfig[]>([
   {
     title: 'Collect statistics',
     description:
-      'Help us improve Mergin Maps by sharing usage information. Mergin Maps collects anonymous usage information to make the service better overtime. You can opt-out anytime.',
+      'Help us improve Mergin Maps by sharing usage information. Mergin Maps collects anonymous usage information to make the service better overtime.',
     key: 'usageInformation'
   }
 ])

diff --git a/web-app/packages/lib/src/common/permission_utils.ts b/web-app/packages/lib/src/common/permission_utils.ts
@@ -128,7 +128,12 @@ export function isAtLeastGlobalRole(
   roleName: ProjectRoleName,
   globalRole: GlobalRole
 ): boolean {
-  return PROJECT_ROLE_BY_NAME[roleName] >= globalRole
+  const globalProjectRole = {
+    [GlobalRole.global_read]: ProjectRole.reader,
+    [GlobalRole.global_write]: ProjectRole.writer,
+    [GlobalRole.global_admin]: ProjectRole.owner
+  }
+  return PROJECT_ROLE_BY_NAME[roleName] >= globalProjectRole[globalRole]
 }
 
 export function getProjectRoleNameValues(): DropdownOption<ProjectRoleName>[] {

diff --git a/web-app/packages/lib/src/modules/project/components/ProjectShareDialog.vue b/web-app/packages/lib/src/modules/project/components/ProjectShareDialog.vue
@@ -163,7 +163,7 @@ const share = async () => {
       roleName: data.permission,
       projectName: projectStore.project.name
     })
-    await projectStore.getProjectAccess(projectStore.project?.id)
+    await projectStore.getProjectCollaborators(projectStore.project?.id)
     dialogStore.close()
   } catch (err) {
     emit('onShareError', err as Error)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@


		def get_version():
		return "2025.2.0"
		return "2025.2.1"