Merge branch 'master' of github.com:enricofer/djakart

enricofer · Jul 2, 2024 · 1c54558 · 1c54558
2 parents 180fb39 + a2ad1e9
commit 1c54558
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/webapp/djakart/models.py b/webapp/djakart/models.py
@@ -125,7 +125,7 @@ def getQgsProject(versione_obj):
 SOURCES={sources}&
 NAMES={names}&
 CRS={crs}&
-GROUP=VERSIONE&
+GROUP=VERSION&
 OVERWRITE=true""".format(**wms_params)
         wms_get_qgis_params = wms_get_qgis_params.replace("\n","")
         host = os.environ.get("QGIS_SERVER_EXTERNAL", '')

diff --git a/webapp/djakart/static/djakart/versioni_finestramappa.js b/webapp/djakart/static/djakart/versioni_finestramappa.js
@@ -155,7 +155,7 @@ function loadFinestraMappa( polyWKT) {
         visible: true,
         source: new ol.source.TileWMS({
             url: base_wms,
-            params: {layers: 'VERSIONE',CRS:CRSID,'DPI':150}
+            params: {layers: 'VERSION',CRS:CRSID,'DPI':150}
         })
     })
 
@@ -164,7 +164,7 @@ function loadFinestraMappa( polyWKT) {
       visible: true,
       source: new ol.source.TileWMS({
         url: versione_wms,
-        params: {layers: 'VERSIONE',CRS:CRSID,'DPI':150}
+        params: {layers: 'VERSION',CRS:CRSID,'DPI':150}
       })
     })
 

diff --git a/webapp/djakart/templates/admin/djakart/change_form.html b/webapp/djakart/templates/admin/djakart/change_form.html
@@ -20,7 +20,7 @@
     <script type="text/javascript" src="/djakart/basemaps/foreground/"></script>
     <script type="text/javascript" src="/djakart/basemaps/background/"></script>
     <script type="text/javascript" src="/djakart/vlist/{{ object_id }}/"></script>
-    <script type="text/javascript" src="/static/djakart/versioni_finestramappa.js?id=17006603039"></script>
+    <script type="text/javascript" src="/static/djakart/versioni_finestramappa.js?id=55006603039"></script>
     <script type="text/javascript" src="/static/djakart/generate_diff.js"></script>
     <script type="text/javascript" src="/static/admin/js/calendar.js"></script>
     <script type="text/javascript" src="/static/admin/js/admin/DateTimeShortcuts.js"></script>

diff --git a/webapp/djakart/templates/admin/resolve_conflicts.html b/webapp/djakart/templates/admin/resolve_conflicts.html
@@ -127,7 +127,7 @@
     let d = decodifica[classname]
     htmlgroup += '    <div>' +
 `      <input type="radio" id="${item_id}" name="${feat_tit}" value="${classname}">` + 
-`      <label class="${classname}" for="${item_id}">VERSIONE ${d} - ${classname}</label>` + 
+`      <label class="${classname}" for="${item_id}">VERSION ${d} - ${classname}</label>` + 
 '    </div>'
   })
 
@@ -217,7 +217,7 @@
       visible: true,
       source: new ol.source.TileWMS({
         url: '{{ root_wms }}{{ version_name }}.qgs',
-        params: {layers: 'VERSIONE',CRS:targetProjection,'DPI':150},
+        params: {layers: 'VERSION',CRS:targetProjection,'DPI':150},
         projection: targetProjection
       })
     })
@@ -227,7 +227,7 @@
       visible: true,
       source: new ol.source.TileWMS({
         url: '{{ root_wms }}{{ base_name }}.qgs',
-        params: {layers: 'VERSIONE',CRS:targetProjection,'DPI':150},
+        params: {layers: 'VERSION',CRS:targetProjection,'DPI':150},
         projection: targetProjection
       })
     })
@@ -279,17 +279,17 @@
 {% endblock %}
 
 {% block content %}
-  <h1>RISOLUZIONE DEI CONFLITTI FRA LA VERSIONE "{{ version_name }}" (theirs) E LA VERSIONE "{{ base_name }} (ours)"</h1>
+  <h1>CONFLICTS RESOLUTION BETWEEN"{{ version_name }}" (theirs version) and "{{ base_name }} (ours version)"</h1>
   <br>
   <form action="" method="GET">{% csrf_token %}
 
     <div id="conflicts" class="row">
-    {% if continue %}<h3>Tutti i conflitti sono stati riconciliati</h3>{% endif %}
+    {% if continue %}<h3>All conflicts are reconciled</h3>{% endif %}
     </div>
 
-    <input type="submit" name="confirmation" value="{% if continue %}Completa Merge{% else %}Risolvi i conflitti{% endif %}"/>
+    <input type="submit" name="confirmation" value="{% if continue %}Completa Merge{% else %}Solve conflicts{% endif %}"/>
 
-    <input type="submit" name="confirmation" value="Risolvi i conflitti rinumerando la versione 'theirs'"/>
+    <input type="submit" name="confirmation" value="Solve conflicts renumbering 'theirs' version"/>
 
   </form>
 {% endblock %}