diff --git a/g3w-admin/qdjango/tests/data/value_relation_qgis328.qgs b/g3w-admin/qdjango/tests/data/value_relation_qgis328.qgs index f9fa19706..bc195ecca 100644 --- a/g3w-admin/qdjango/tests/data/value_relation_qgis328.qgs +++ b/g3w-admin/qdjango/tests/data/value_relation_qgis328.qgs @@ -1,5 +1,5 @@ - + @@ -21,24 +21,23 @@ - + - + poi_2c470d17_a234_464c_83f8_416bcdedda17 - poi_type_2e216f86_c925_4039_a760_52dc4e2b87b9 - + - + @@ -70,156 +69,131 @@ - - - - - - - + - + - - degrees - - 0 - 0 - 0 - 0 - - 0 - - - GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] - +proj=longlat +datum=WGS84 +no_defs - 3452 - 4326 - EPSG:4326 - WGS 84 - longlat - EPSG:7030 - true - - - 0 - - - + Annotazioni_8a9f9d8b_d1e4_4305_85b4_c2110f051d89 @@ -270,18 +244,18 @@ - + - 29099307.18904989957809448 - 6524716.7632708502933383 - 55421878.81687570363283157 - 23153423.48566510155797005 + 29099307.1890498623251915 + 6524716.76327085494995117 + 55421878.81687566637992859 + 23153423.48566505685448647 - -98.59647594787405467 - 50.45080665626462491 - 137.86320815819431118 - 86.96255517361525733 + -98.59647594787440994 + 50.45080665626466754 + 137.86320815819399854 + 86.96255517361522891 poi_2c470d17_a234_464c_83f8_416bcdedda17 dbname='./geodata/value_relation_filter.sqlite' table="poi" (geometry) @@ -335,7 +309,7 @@ - + @@ -360,181 +334,181 @@ 1 0 - + - + - + - + - + - + - + - + - + - + - + @@ -545,64 +519,65 @@ - 0 0 1 - - + + + - + - + @@ -610,20 +585,20 @@ - + - + - + @@ -651,59 +626,59 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - @@ -757,7 +732,7 @@ def my_form_open(dialog, layer, feature): "cod" - + poi_type_2e216f86_c925_4039_a760_52dc4e2b87b9 dbname='./geodata/value_relation_filter.sqlite' table="poi_type" @@ -818,138 +793,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - + - + - + - + - + @@ -958,18 +933,18 @@ def my_form_open(dialog, layer, feature): - + - + @@ -995,35 +970,35 @@ def my_form_open(dialog, layer, feature): - - - + + + - - - + + + - - - + + + - - - + + + - + - + - @@ -1049,7 +1024,6 @@ def my_form_open(dialog, layer, feature): - @@ -1169,9 +1143,9 @@ def my_form_open(dialog, layer, feature): @@ -1200,9 +1174,9 @@ def my_form_open(dialog, layer, feature): - + - + PROJCRS["WGS 84 / Pseudo-Mercator",BASEGEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4326]],CONVERSION["Popular Visualisation Pseudo-Mercator",METHOD["Popular Visualisation Pseudo Mercator",ID["EPSG",1024]],PARAMETER["Latitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8801]],PARAMETER["Longitude of natural origin",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8802]],PARAMETER["False easting",0,LENGTHUNIT["metre",1],ID["EPSG",8806]],PARAMETER["False northing",0,LENGTHUNIT["metre",1],ID["EPSG",8807]]],CS[Cartesian,2],AXIS["easting (X)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["northing (Y)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Web mapping and visualisation."],AREA["World between 85.06°S and 85.06°N."],BBOX[-85.06,-180,85.06,180]],ID["EPSG",3857]] +proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs @@ -1216,41 +1190,41 @@ def my_form_open(dialog, layer, feature): - + - + - + diff --git a/g3w-admin/templates/include/navbar_right_menu.html b/g3w-admin/templates/include/navbar_right_menu.html index 5b28407e8..2af496025 100644 --- a/g3w-admin/templates/include/navbar_right_menu.html +++ b/g3w-admin/templates/include/navbar_right_menu.html @@ -1,5 +1,6 @@ {% load i18n %} {% load static %} +{% load auth_extras %}
    @@ -77,12 +78,14 @@ {% endif %} - {% if user.is_superuser %}
  • + {% if user.is_superuser or user|has_group:G3W_EDITOR1 %} -
    • + {% else %} + {% endif %} + {% endif %}
\ No newline at end of file diff --git a/g3w-admin/templates/include/sidebar_right.html b/g3w-admin/templates/include/sidebar_right.html index a1cdfba72..ec25f4177 100644 --- a/g3w-admin/templates/include/sidebar_right.html +++ b/g3w-admin/templates/include/sidebar_right.html @@ -8,6 +8,7 @@

{% trans 'Configurations' %}

- {% if user.is_staff %}