Merge branch 'main' into dev

smartcommunitylab · Dec 17, 2024 · 5a81a33 · 5a81a33
2 parents 2341671 + 0f58083
commit 5a81a33
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/console_aziendale/src/components/leaflet-map/GeoLocationSelectorMap.vue b/console_aziendale/src/components/leaflet-map/GeoLocationSelectorMap.vue
@@ -115,7 +115,7 @@ export default {
             lng: this.actualLocation?.item?.longitude,
           };
         }
-        this.zoom = 14;
+        this.zoom = 16;
         this.disableMap();
       }, 250);
     },

diff --git a/console_aziendale/src/components/modal/specific-modals/LocationFormModal.vue b/console_aziendale/src/components/modal/specific-modals/LocationFormModal.vue
@@ -502,7 +502,7 @@
       </form>
     </template>
     <template v-slot:footer>
-      <v-btn text @click="closeThisModal" class="py-8 ml-8"> Annulla </v-btn>
+      <v-btn text @click="closeThisModal" :disabled="manualEnabling" class="py-8 ml-8"> Annulla </v-btn>
       <v-btn
         color="primary"
         text
@@ -639,7 +639,7 @@ export default {
       menu: false,
       pointIsFar: false,
       autoPositionLocation: null,
-      zoom: 13,
+      zoom: 14,
       url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
       attribution:
         '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors',

diff --git a/console_aziendale/src/pages/locations/Location.vue b/console_aziendale/src/pages/locations/Location.vue
@@ -106,7 +106,7 @@ export default {
 
   data() {
     return {
-      zoom: 13,
+      zoom: 16,
       url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
       attribution:
         '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors',