Backport 2024.7.0 to develop (#333)

* Set proper project version type in flask cmd * fix spelling of template * Remove pretty text wrap froom span --------- Co-authored-by: Martin Varga <[email protected]>
MerginMaps · Nov 19, 2024 · 87f9c29 · 87f9c29
1 parent dabd132
commit 87f9c29
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/server/mergin/sync/commands.py b/server/mergin/sync/commands.py
@@ -50,7 +50,7 @@ def create(name, namespace, user):  # pylint: disable=W0612
 
     @project.command()
     @click.argument("project-name")
-    @click.option("--version", required=True)
+    @click.option("--version", type=int, required=True)
     @click.option("--directory", type=click.Path(), required=True)
     def download(project_name, version, directory):  # pylint: disable=W0612
         """Download files for project at particular version"""

diff --git a/web-app/packages/admin-lib/src/modules/admin/components/AdminProjectsTable.vue b/web-app/packages/admin-lib/src/modules/admin/components/AdminProjectsTable.vue
@@ -70,9 +70,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
               :sortable="header.sortable"
             >
               <template #body="slotProps">
-                <templte v-if="slotProps.data.removed_at">{{
+                <template v-if="slotProps.data.removed_at">{{
                   slotProps.data.name
-                }}</templte>
+                }}</template>
                 <router-link
                   v-else
                   :to="{

diff --git a/web-app/packages/lib/src/assets/sass/themes/mm-theme-light/_extensions.scss b/web-app/packages/lib/src/assets/sass/themes/mm-theme-light/_extensions.scss
@@ -18,6 +18,9 @@ body, p, dd, dl {
 }
 p, span, dl, li {
   overflow-wrap: break-word;
+}
+p, dl, li {
+  overflow-wrap: break-word;
   text-wrap: pretty;
 }
 dd {