Zooflow: Fix wrong image on dragdrop, prepare removal of manual database config

This commit is contained in:
Jonathan Jenne
2022-04-04 16:40:25 +02:00
parent de451e8c57
commit 8ff4ae5a27
11 changed files with 166 additions and 109 deletions

View File

@@ -9,6 +9,7 @@ Imports DigitalData.GUIs.ZooFlow.Administration.ClassConstants
Imports DevExpress.XtraGrid
Imports DevExpress.XtraBars
Imports DigitalData.Modules.Language
Imports DigitalData.Controls.SQLConfig
Public Class frmAdmin_Start
Private CurrentModule As String
@@ -29,6 +30,13 @@ Public Class frmAdmin_Start
DetailForm = New ClassDetailForm(My.LogConfig)
AddHandler DetailForm.DetailFormClosed, AddressOf DetailForm_Closed
If My.SystemConfig.ConnectionString = String.Empty Then
If ShowDatabaseSettings() = False Then
MsgBox("Die Datenbank verbindung wurde nicht konfiguriert. Die Administration kann nicht verwendet werden.", MsgBoxStyle.Critical, Text)
Exit Sub
End If
End If
DetailForm.LoadData()
TreeListMenu.ExpandAll()
End Sub
@@ -283,7 +291,24 @@ Public Class frmAdmin_Start
oForm.ShowDialog()
End Sub
Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click
Private Sub btnDatabaseConnection_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnDatabaseConnection.ItemClick
ShowDatabaseSettings()
End Sub
Private Function ShowDatabaseSettings() As Boolean
Dim oForm As New frmSQLConfig(My.LogConfig) With {
.ConnectionString = My.SystemConfig.ConnectionString,
.FormTitle = "ECM Datenbank"
}
Dim oResult = oForm.ShowDialog()
If oResult = DialogResult.OK Then
My.SystemConfig.ConnectionString = oForm.ConnectionString
My.SystemConfigManager.Save()
Return True
Else
Return False
End If
End Function
End Class