Merge branch 'dev-3.6' into master-3.6

Author: edgarfuste

core/shared/mincut_tools.py

@@ -239,14 +239,19 @@ def delete_mincut(**kwargs):
     title = "Delete mincut"
 
     # Check for mincuts not allowed to be deleted
-    sql = (f"SELECT * FROM {table_name}"
-           f" WHERE {column_id} IN ({list_id}) AND (anl_user != current_user OR mincut_state != 0)")
-    rows = tools_db.execute_returning(sql, show_exception=False)
-    if rows:
-        message = "You can't delete these mincuts because they aren't planified \n" \
-                  "or they were created by another user:"
-        tools_qt.show_info_box(message, title, inf_text)
-        return
+    row = tools_gw.get_config_value('om_mincut_settings', table='config_param_system')
+    om_mincut_settings = row[0] if row else None
+    if om_mincut_settings:
+        om_mincut_settings = json.loads(om_mincut_settings)
+    if (om_mincut_settings is None or not om_mincut_settings.get('deleteUsers') or om_mincut_settings['deleteUsers'] == 'creator'):
+        sql = (f"SELECT * FROM {table_name}"
+            f" WHERE {column_id} IN ({list_id}) AND (anl_user != current_user OR mincut_state != 0)")
+        rows = tools_db.execute_returning(sql, show_exception=False)
+        if rows:
+            message = "You can't delete these mincuts because they aren't planified \n" \
+                    "or they were created by another user:"
+            tools_qt.show_info_box(message, title, inf_text)
+            return
 
     answer = tools_qt.show_question(message, title, inf_text)
     if answer:

core/shared/search.py

@@ -107,7 +107,8 @@ def open_search(self, dlg_search, dlg_mincut=None):
                         widget = self._set_typeahead_completer(widget, completer)
                         self.lineedit_list.append(widget)
                     elif field['widgettype'] == 'combo':
-                        widget = self._add_combobox(field)
+                        widget = tools_gw.add_combo(field)
+                        widget.currentIndexChanged.connect(partial(self._clear_lineedits))
                     elif field['widgettype'] == 'check':
                         kwargs = {"dialog": self.dlg_search, "field": field}
                         widget = tools_gw.add_checkbox(**kwargs)
@@ -183,7 +184,7 @@ def export_to_csv(self, dialog, qtable_1=None, qtable_2=None, path=None):
 
 
     def refresh_tab(self, tab_name=None):
-        
+
         if tab_name:
             form = f'"singleTab":"{tab_name}"'
         else:
@@ -203,8 +204,7 @@ def refresh_tab(self, tab_name=None):
                 try:
                     if field['widgettype'] == 'combo':
                         widget = main_tab.findChild(QComboBox, field['widgetname'])
-                        list_items = self._get_list_items(widget, field)
-                        tools_qt.fill_combo_values(widget, list_items)
+                        tools_gw.fill_combo(widget, field)
                 except Exception:
                     msg = f"key 'comboIds' or/and comboNames not found WHERE columname='{field['columnname']}' AND " \
                           f"widgetname='{field['widgetname']}' AND widgettype='{field['widgettype']}'"
@@ -481,46 +481,13 @@ def _clear_line_edit_add(self, line_list):
         line_edit_add.blockSignals(False)
 
 
-    def _add_combobox(self, field):
-
-        widget = QComboBox()
-        widget.setObjectName(field['widgetname'])
-        widget.setProperty('columnname', field['columnname'])
-        list_items = self._get_list_items(widget, field)
-        tools_qt.fill_combo_values(widget, list_items)
-        tools_qt.set_combo_value(widget, field.get('selectedId'), 0, add_new=False)
-        # noinspection PyUnresolvedReferences
-        widget.currentIndexChanged.connect(partial(self._clear_lineedits))
-
-        return widget
-
-
     def _clear_lineedits(self):
 
         # Clear all lineedit widgets from search tabs
         for widget in self.lineedit_list:
             tools_qt.set_widget_text(self.dlg_search, widget, '')
 
 
-    def _get_list_items(self, widget, field):
-
-        # Generate list of items to add into combo
-        widget.blockSignals(True)
-        widget.clear()
-        widget.blockSignals(False)
-        list_items = []
-        comboIds = field.get('comboIds')
-        comboNames = field.get('comboNames')
-        comboFeature = field.get('comboFeature')
-        if None not in (comboIds, comboNames):
-            for i in range(0, len(comboIds)):
-                if comboFeature:
-                    elem = [comboIds[i], comboNames[i], comboFeature[i]]
-                else:
-                    elem = [comboIds[i], comboNames[i]]
-                list_items.append(elem)
-        return list_items
-
     def _open_hydrometer_dialog(self, table_name=None, feature_id=None, sys_feature_type_id=None, basic_search_hydrometer=False, feature_type=None):
         if basic_search_hydrometer:
             self.customForm = GwInfo(tab_type='data')

metadata.txt

@@ -4,10 +4,10 @@ qgisMinimumVersion=3.22
 qgisMaximumVersion=3.40
 description=Plugin to manage water networks (water supply, sewerage and urban drainage) using QGIS and PostGIS-PostgreSQL
 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. Third-Party Libraries: WNTR. More information on their licenses can be found on the repository README file.
-version=3.6.020
+version=3.6.021
 author=David Erill, Natasa Cica, Nestor Ibañez, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fusté, Albert Bofill, Sergi Maspons, Lia Bertran, Abel García Juanes, Maria Guzmán, Jordi Blanch, Xavier Torret, Daniel Marín, Ferran Martínez, Nico Pérez, Pablo Marques, Arnau Torret, Namrata Karki, Arnau Urgeles, Oscar Pueyo
 
-Changelog=Version 3.6.020
+Changelog=Version 3.6.021
 
 
 tags= giswater, water networks, sewerage, urban drainage, EPANET, SWMM