From 1311839f3cc3de03d03261dbb696855f54b9c8af Mon Sep 17 00:00:00 2001 From: Sergi Maspons Date: Tue, 20 Sep 2022 13:27:28 +0200 Subject: [PATCH 1/5] Update metadata --- metadata.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/metadata.txt b/metadata.txt index b7173f28b..4b3c02929 100644 --- a/metadata.txt +++ b/metadata.txt @@ -4,16 +4,11 @@ qgisMinimumVersion=3.10 qgisMaximumVersion=3.99 description=Plugin to manage water networks (water supply, sewerage and urban drainage) using QGIS and PostGIS-PostgreSQL(from 9.5 to 14.x) about=Disclaimer: This plugin is released using the open source GNU-GPL3 license. Although a reasonable effort has been made to assure that the results obtained are correct, some of the capabilities provided by Giswater are experimental, therefore the development team and the Giswater Association are not responsible and assume no liability whatsoever for any results or any use made of the results obtained from the program, nor for any damages or litigation that result from the use of these programs for any purpose. -version=3.5.028 +version=3.5.029 author=David Erill, Luigi Pirelli, Natasa Cica, Nestor Ibañez, Adrian Valenciano, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fusté, Albert Bofill, Sergi Maspons, Elies Bertran, Abel García Juanes, Xavier Torret -Changelog=Version 3.5.028 - - Highlight connecs/gullys that will be disconnected on feature end process - - Improve performance for inserting features in large tables - - Allow adding filters as additional columns in toolbox reports - - Improve dscenario filter - - Bug fix: insert document from another dialog (info/visit) - - Bug fix: don't allow role_basic/role_om users to edit in info +Changelog=Version 3.5.029 + tags= giswater, water networks, sewerage, urban drainage, EPANET, SWMM homepage=https://www.giswater.org From 0ba3bad870d99ac42ee6fcfb699bde778e38a604 Mon Sep 17 00:00:00 2001 From: Albert Bofill Date: Tue, 20 Sep 2022 18:15:26 +0200 Subject: [PATCH 2/5] Add user_params --- config/user_params.config | 1 + 1 file changed, 1 insertion(+) diff --git a/config/user_params.config b/config/user_params.config index c0985b6c8..a788f910b 100644 --- a/config/user_params.config +++ b/config/user_params.config @@ -743,6 +743,7 @@ _gw_fct_graphanalytics_minsector_usepsectors = None _gw_fct_graphanalytics_minsector_updatefeature = None _gw_fct_graphanalytics_minsector_geomparamupdate = None _gw_fct_graphanalytics_minsector_updatemapzone = None +_gw_fct_graphanalytics_mapzones_advanced_commitchanges = None [session.docker] _position = None From 8f8a337c4a78bb8f2ba7c5a3c7f4583a7b8c1abc Mon Sep 17 00:00:00 2001 From: Sergi Maspons Date: Wed, 21 Sep 2022 10:40:15 +0200 Subject: [PATCH 3/5] Minor bug fix: don't manage 'isNullValue' key in python --- core/utils/tools_gw.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/utils/tools_gw.py b/core/utils/tools_gw.py index 7b7081eac..b197d821b 100644 --- a/core/utils/tools_gw.py +++ b/core/utils/tools_gw.py @@ -1742,8 +1742,6 @@ def fill_combo(widget, field): comboIds = field.get('comboIds') comboNames = field.get('comboNames') if comboIds and comboNames: - if tools_os.set_boolean(field.get('isNullValue'), True): - combolist.append(['', '']) for i in range(0, len(field['comboIds'])): elem = [comboIds[i], comboNames[i]] combolist.append(elem) From ded401fd354a3540aec1385642c46b69fea0b655 Mon Sep 17 00:00:00 2001 From: Sergi Maspons Date: Thu, 22 Sep 2022 15:26:14 +0200 Subject: [PATCH 4/5] Bug fix: manage project_epsg when executing custom sql files --- core/admin/admin_btn.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/admin/admin_btn.py b/core/admin/admin_btn.py index 95ae962d5..23c6afc39 100644 --- a/core/admin/admin_btn.py +++ b/core/admin/admin_btn.py @@ -56,6 +56,7 @@ def __init__(self): self.plugin_version, self.message = tools_qgis.get_plugin_version() self.canvas = global_vars.canvas self.project_type = None + self.project_epsg = None self.dlg_readsql = None self.dlg_info = None self.dlg_readsql_create_project = None @@ -1791,7 +1792,11 @@ def _execute_files(self, filedir, i18n=False, no_ct=False, utils_schema_name=Non schema_name = schema_name.replace('"', '') else: schema_name = self.schema.replace('"', '') - self.project_epsg = str(self.project_epsg).replace('"', '') + if self.project_epsg: + self.project_epsg = str(self.project_epsg).replace('"', '') + else: + msg = "There is no project selected or it is not valid. Please check the first tab..." + tools_qgis.show_warning(msg) # Manage folders 'i18n' manage_i18n = i18n From 2e34ca82a5bbd404ae229236f899a7eb930dc27c Mon Sep 17 00:00:00 2001 From: Sergi Maspons Date: Thu, 22 Sep 2022 16:07:03 +0200 Subject: [PATCH 5/5] Update metadata & dbmodel --- dbmodel | 2 +- metadata.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbmodel b/dbmodel index 715f78416..84dff3c54 160000 --- a/dbmodel +++ b/dbmodel @@ -1 +1 @@ -Subproject commit 715f784163d9d47dd8a9e005dc7555d9b36da328 +Subproject commit 84dff3c544a9cd58b9944a609e06627e14504f03 diff --git a/metadata.txt b/metadata.txt index 4b3c02929..0630a99aa 100644 --- a/metadata.txt +++ b/metadata.txt @@ -8,7 +8,7 @@ version=3.5.029 author=David Erill, Luigi Pirelli, Natasa Cica, Nestor Ibañez, Adrian Valenciano, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fusté, Albert Bofill, Sergi Maspons, Elies Bertran, Abel García Juanes, Xavier Torret Changelog=Version 3.5.029 - + - Minor bug fixes tags= giswater, water networks, sewerage, urban drainage, EPANET, SWMM homepage=https://www.giswater.org