Force fom suppres

Oslandia · Oct 16, 2020 · 50567b1 · 50567b1
1 parent 0b8cf86
commit 50567b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/map_tools/dimensioning.py b/map_tools/dimensioning.py
@@ -29,7 +29,9 @@ def open_new_dimensioning(self, feature_id):
 
         # Restore user value (Settings/Options/Digitizing/Suppress attribute from pop-up after feature creation)
         QSettings().setValue("/Qgis/digitizing/disable_enter_attribute_values_dialog", self.suppres_form)
-
+        config = self.layer.editFormConfig()
+        config.setSuppress(self.conf_supp)
+        self.layer.setEditFormConfig(config)
         self.recover_previus_maptool()
 
         self.api_dim = ApiDimensioning(self.iface, self.settings, self.controller, self.plugin_dir)
@@ -73,6 +75,10 @@ def activate(self):
             # and set True
             self.suppres_form = QSettings().value("/Qgis/digitizing/disable_enter_attribute_values_dialog")
             QSettings().setValue("/Qgis/digitizing/disable_enter_attribute_values_dialog", True)
+            config = self.layer.editFormConfig()
+            self.conf_supp = config.suppress()
+            config.setSuppress(0)
+            self.layer.setEditFormConfig(config)
             self.iface.setActiveLayer(self.layer)
             self.controller.set_layer_visible(self.layer)
             self.layer.startEditing()

diff --git a/sql b/sql
+1 −1		corporate/daily/gw_daily_ddl.sql
+2 −2		corporate/daily/gw_daily_dml.sql
+7 −3		corporate/daily/gw_fct_utils_daily_update.sql
+727 −0		dev/i18n/i18n.sql
+2 −2		example/user/ud/ud_91_sample_config_zones.sql
+2,119 −713		example/user/ud/ud_96_sample_elements.sql
+19 −39		example/user/ud/ud_99_sample_other.sql
+2 −2		example/user/ws/ws_91_sample_config_zones.sql
+4 −0		example/user/ws/ws_99_sample_other.sql
+22 −17		ud/fct/ud_gw_fct_import_swmm_inp.sql
+4 −0		ud/fct/ud_gw_fct_pg2epa_main.sql
+2 −2		ud/ftrg/ud_gw_trg_edit_arc.sql
+12 −8		ud/ftrg/ud_gw_trg_edit_connec.sql
+14 −8		ud/ftrg/ud_gw_trg_edit_gully.sql
+2 −2		ud/ftrg/ud_gw_trg_edit_node.sql
+2 −1		ud/ftrg/ud_gw_trg_plan_gully_x_psector.sql
+10 −6		ud/ftrg/ud_gw_trg_topocontrol_node.sql
+5 −5		ud/ftrg/ud_gw_trg_vi.sql
+6 −42		updates/32/32000/utils/dml.sql
+0 −3		updates/32/32002/utils/dml.sql
+6 −35		updates/32/32013/utils/dml.sql
+2 −5		updates/33/33002/utils/ddl.sql
+0 −1		updates/33/33009/utils/dml.sql
+7 −7		updates/33/33022/ud/dml.sql
+2 −1		updates/34/34005/ud/ddlview.sql
+0 −18		updates/34/34006/ud/ddlview.sql
+0 −12		updates/34/34006/ws/ddlview.sql
+2 −0		updates/34/34009/utils/ddl.sql
+12 −3		updates/34/34009/ws/dml.sql
+6 −5		updates/34/34011/ws/ddl.sql
+2 −2		updates/34/34015/utils/dml.sql
+0 −6		updates/34/34019/utils/dml.sql
+10 −0		updates/34/34020/ud/dml.sql
+0 −6		updates/34/34020/utils/dml.sql
+16 −0		updates/34/34020/ws/dml.sql
+96 −25		updates/34/34021/ud/ddlview.sql
+16 −0		updates/34/34021/utils/ddl.sql
+41 −0		updates/34/34021/utils/dml.sql
+5 −1		updates/34/34021/utils/trg.sql
+15 −0		updates/34/34021/ws/ddl.sql
+167 −18		updates/34/34021/ws/ddlview.sql
+21 −9		updates/34/34021/ws/dml.sql
+24 −0		updates/34/34021/ws/trg.sql
+1 −1		utils/fct/gw_fct_admin_manage_backup.sql
+0 −1		utils/fct/gw_fct_admin_role_permissions.sql
+3 −0		utils/fct/gw_fct_getchilds.sql
+2 −2		utils/fct/gw_fct_getfeatureupsert.sql
+91 −0		utils/fct/gw_fct_getfiltervaluesvdef.sql
+1 −1		utils/fct/gw_fct_getformfields.sql
+0 −5		utils/fct/gw_fct_getinfofromid.sql
+5 −5		utils/fct/gw_fct_getinsertformdisabled.sql
+13 −9		utils/fct/gw_fct_getlist.sql
+24 −14		utils/fct/gw_fct_getstylemapzones.sql
+60 −9		utils/fct/gw_fct_getvisit_main.sql
+2 −2		utils/fct/gw_fct_grafanalytics_flowtrace.sql
+15 −15		utils/fct/gw_fct_odbc2pg_hydro_filldata.sql
+59 −7		utils/fct/gw_fct_om_check_data.sql
+4 −7		utils/fct/gw_fct_om_visit_multiplier.sql
+29 −12		utils/fct/gw_fct_pg2epa_check_network.sql
+2 −2		utils/fct/gw_fct_rpt2pg_log.sql
+107 −69		utils/fct/gw_fct_setfields.sql
+7 −0		utils/fct/gw_fct_setselectors.sql
+10 −7		utils/fct/gw_fct_setvisit.sql
+17 −17		utils/ftrg/gw_trg_edit_link.sql
+34 −22		utils/ftrg/gw_trg_om_visit_multievent.sql
+2 −1		utils/ftrg/gw_trg_plan_connec_x_psector.sql
+19 −6		utils/ftrg/gw_trg_plan_psector_link.sql
+122 −35		ws/fct/ws_gw_fct_grafanalytics_mapzones.sql
+5 −5		ws/fct/ws_gw_fct_grafanalytics_minsector.sql
+15 −10		ws/fct/ws_gw_fct_import_epanet_inp.sql
+19 −4		ws/fct/ws_gw_fct_mincut.sql
+1 −1		ws/fct/ws_gw_fct_pg2epa_check_data.sql
+27 −2		ws/fct/ws_gw_fct_pg2epa_check_options.sql
+42 −10		ws/fct/ws_gw_fct_pg2epa_dscenario.sql
+4 −0		ws/fct/ws_gw_fct_pg2epa_main.sql
+3 −3		ws/fct/ws_gw_fct_pg2epa_vnodetrimarcs.sql
+7 −0		ws/fct/ws_gw_fct_rpt2pg_import_rpt.sql
+2 −2		ws/ftrg/ws_gw_trg_edit_arc.sql
+16 −8		ws/ftrg/ws_gw_trg_edit_connec.sql
+0 −2		ws/ftrg/ws_gw_trg_edit_inp_arc.sql
+19 −25		ws/ftrg/ws_gw_trg_edit_inp_demand.sql
+2 −2		ws/ftrg/ws_gw_trg_edit_node.sql
+1 −1		ws/ftrg/ws_gw_trg_vi.sql