grant roles and install demodata

Author: domi4484

oqtopus/gui/main_dialog.py

@@ -171,15 +171,12 @@ def __initGuiDatabase(self):
 
         actionCreateDb = QAction(self.tr("Create database"), db_operations_menu)
         self.__actionDuplicateDb = QAction(self.tr("Duplicate database"), db_operations_menu)
-        actionCreateAndGrantRoles = QAction(self.tr("Create and grant roles"), db_operations_menu)
 
         actionCreateDb.triggered.connect(self.__createDatabaseClicked)
         self.__actionDuplicateDb.triggered.connect(self.__duplicateDatabaseClicked)
-        actionCreateAndGrantRoles.triggered.connect(self.__createAndGrantRolesClicked)
 
         db_operations_menu.addAction(actionCreateDb)
         db_operations_menu.addAction(self.__actionDuplicateDb)
-        db_operations_menu.addAction(actionCreateAndGrantRoles)
 
         self.db_operations_toolButton.setMenu(db_operations_menu)
 
@@ -681,10 +678,14 @@ def __installModuleClicked(self):
                 parameters={"SRID": srid},
             )
             with OverrideCursor(Qt.CursorShape.WaitCursor):
-                upgrader.install()
+                upgrader.install(
+                    roles=self.db_parameters_CreateAndGrantRoles_checkBox.isChecked(),
+                    grant=self.db_parameters_CreateAndGrantRoles_checkBox.isChecked(),
+                    demo_data=self.db_parameters_DemoData_checkBox.isChecked(),
+                )
         except Exception as exception:
             CriticalMessageBox(
-                self.tr("Error"), self.tr("Can't install/upgrade module:"), exception, self
+                self.tr("Error"), self.tr("Can't install the module:"), exception, self
             ).exec()
             return
 
@@ -716,16 +717,6 @@ def __upgradeModuleClicked(self):
 
         raise NotImplementedError("Upgrade module is not implemented yet")
 
-    def __createAndGrantRolesClicked(self):
-
-        if self.__pum_config is None:
-            CriticalMessageBox(
-                self.tr("Error"), self.tr("No valid module available."), None, self
-            ).exec()
-            return
-
-        raise NotImplementedError("Create and grant roles is not implemented yet")
-
     def __projectInstallClicked(self):
 
         if self.__current_module is None:

oqtopus/ui/main_dialog.ui

@@ -593,6 +593,23 @@
                   </property>
                  </widget>
                 </item>
+                <item row="1" column="0" colspan="2">
+                 <widget class="QCheckBox" name="db_parameters_CreateAndGrantRoles_checkBox">
+                  <property name="text">
+                   <string>Create and grant roles</string>
+                  </property>
+                  <property name="checked">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="2" column="0" colspan="2">
+                 <widget class="QCheckBox" name="checkBox">
+                  <property name="text">
+                   <string>Install demo data</string>
+                  </property>
+                 </widget>
+                </item>
                </layout>
               </widget>
              </item>