Merge pull request #850 from Giswater/dev-3.5

Dev 3.5
Giswater · Jan 21, 2022 · 868b0e8 · 868b0e8
2 parents 25705cb + c99eda2
commit 868b0e8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/core/admin/admin_btn.py b/core/admin/admin_btn.py
@@ -543,21 +543,25 @@ def update_31to39(self, new_project=False, project_type=False, no_ct=False):
                 if new_project:
                     if self.dev_commit is True:
                         if str(sub_folder) > '31100':
-                            self.update_minor31to39(folder_update, new_project, project_type, no_ct)
-
+                            status = self.update_minor31to39(folder_update, new_project, project_type, no_ct)
+                            if status is False:
+                                return False
                     else:
                         if str(sub_folder) > '31100' and str(sub_folder) <= str(self.plugin_version).replace('.', ''):
-                            self.update_minor31to39(folder_update, new_project, project_type, no_ct)
-
+                            status = self.update_minor31to39(folder_update, new_project, project_type, no_ct)
+                            if status is False:
+                                return False
                 else:
                     if self.dev_commit is True:
                         if str(sub_folder) > str(self.project_version).replace('.', '') and str(sub_folder) > '31100':
-                            self.update_minor31to39(folder_update, new_project, project_type, no_ct)
-
+                            status = self.update_minor31to39(folder_update, new_project, project_type, no_ct)
+                            if status is False:
+                                return False
                     else:
                         if str(sub_folder) > str(self.project_version).replace('.', '') and str(sub_folder) > '31100' and str(sub_folder) <= str(self.plugin_version).replace('.', ''):
-                            self.update_minor31to39(folder_update, new_project, project_type, no_ct)
-
+                            status = self.update_minor31to39(folder_update, new_project, project_type, no_ct)
+                            if status is False:
+                                return False
         return True
 
 

diff --git a/core/shared/psector.py b/core/shared/psector.py
@@ -133,8 +133,11 @@ def get_psector(self, psector_id=None, is_api=False):
         num_value.setValidator(QIntValidator())
         where = " WHERE typevalue = 'psector_type' "
         self.populate_combos(self.dlg_plan_psector.psector_type, 'idval', 'id', 'plan_typevalue', where)
+
+        # Manage other_price tab variables
         self.price_loaded = False
         self.header_exist = None
+        self.load_signals = False
 
         # Populate combo status
         sql = "SELECT id, idval FROM plan_typevalue WHERE typevalue = 'value_priority'"
@@ -854,8 +857,8 @@ def check_tab_position(self):
         if self.dlg_plan_psector.tabWidget.currentIndex() == 3:
             tableleft = "v_price_compost"
             tableright = f"v_edit_plan_psector_x_other"
-            field_id_right = "price_id"
-            self.price_selector(self.dlg_plan_psector, tableleft, tableright, field_id_right)
+            if not self.load_signals:
+                self.price_selector(self.dlg_plan_psector, tableleft, tableright)
         elif self.dlg_plan_psector.tabWidget.currentIndex() == 4:
             self.populate_budget(self.dlg_plan_psector, psector_id)
         elif self.dlg_plan_psector.tabWidget.currentIndex() == 5:
@@ -1079,8 +1082,10 @@ def set_plan(self):
         return json_result
 
 
-    def price_selector(self, dialog, tableleft, tableright, field_id_right):
+    def price_selector(self, dialog, tableleft, tableright):
+
 
+        self.load_signals = True
 
         # fill QTableView all_rows
         tbl_all_rows = dialog.findChild(QTableView, "all_rows")

diff --git a/core/toolbars/toc/add_child_layer_button.py b/core/toolbars/toc/add_child_layer_button.py
@@ -119,7 +119,7 @@ def _manage_load_all(self, fields, group, sub_group, sub_sub_group=None):
                     else:
                         the_geom = field['geomField']
                     geom_field = field['tableId']
-                    style_id = None
+                    style_id = field['style_id']
                     group = context['level_1']
                     sub_group = context['level_2']
 

diff --git a/dbmodel b/dbmodel
+3 −1		example/user/ud/ud_99_sample_other.sql
+27 −1		example/user/ws/ws_99_sample_other.sql
+7 −2		ud/ftrg/ud_gw_trg_edit_arc.sql
+4 −1		updates/35/35021/ud/dml.sql
+4 −1		updates/35/35021/utils/ddl.sql
+4 −0		updates/35/35021/utils/dml.sql
+1 −2		utils/fct/gw_fct_getaddlayervalues.sql
+14 −14		utils/fct/gw_fct_setcheckproject.sql
+8 −0		utils/fct/gw_fct_setfeaturedelete.sql
+31 −20		ws/fct/ws_gw_fct_grafanalytics_mapzones.sql
+6 −2		ws/fct/ws_gw_fct_grafanalytics_mapzones_advanced.sql
+5 −0		ws/ftrg/ws_gw_trg_edit_arc.sql