Bug fix: admin_btn -- update schema folder path missing separator

(cherry picked from commit b6b3998)
Giswater · Dec 23, 2021 · 5bde878 · 5bde878
1 parent 4ced8f6
commit 5bde878
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/core/admin/admin_btn.py b/core/admin/admin_btn.py
@@ -370,7 +370,7 @@ def load_updates(self, project_type=None, update_changelog=False, schema_name=No
         self.task1 = GwTask('Manage schema')
         QgsApplication.taskManager().addTask(self.task1)
         self.task1.setProgress(0)
-        status = self._load_fct_ftrg(project_type)
+        status = self._load_fct_ftrg()
         self.task1.setProgress(20)
         self.task1.setProgress(40)
         if status:
@@ -1516,10 +1516,10 @@ def _read_info_version(self):
 
         folders = sorted(os.listdir(self.folder_updates + ''))
         for folder in folders:
-            sub_folders = sorted(os.listdir(self.folder_updates + folder))
+            sub_folders = sorted(os.listdir(self.folder_updates + os.sep + folder))
             for sub_folder in sub_folders:
                 if str(sub_folder) > str(self.project_version).replace('.', ''):
-                    folder_aux = self.folder_updates + folder + os.sep + sub_folder
+                    folder_aux = self.folder_updates + os.sep + folder + os.sep + sub_folder
                     if self._process_folder(folder_aux, ''):
                         status = self._read_files(sorted(os.listdir(folder_aux + '')), folder_aux + '')
                         if status is False:
@@ -1840,9 +1840,9 @@ def _read_execute_file(self, filedir, file, schema_name, project_epsg, set_progr
 
             # Manage progress bar
             if set_progress_bar:
-                self.progress_value = int(float(self.current_sql_file / self.total_sql_files) * 100)
-                self.progress_value = int(self.progress_value * self.progress_ratio)
                 if hasattr(self, 'task_create_schema') and not isdeleted(self.task_create_schema):
+                    self.progress_value = int(float(self.current_sql_file / self.total_sql_files) * 100)
+                    self.progress_value = int(self.progress_value * self.progress_ratio)
                     self.task_create_schema.set_progress(self.progress_value)
 
             if hasattr(self, 'task_create_schema') and not isdeleted(self.task_create_schema) and self.task_create_schema.isCanceled():