Version 1.1.0.0

This commit is contained in:
Jonathan Jenne 2020-10-02 16:46:44 +02:00
parent 1c6114b41e
commit 173cbdb49c
2 changed files with 12 additions and 11 deletions

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.0.2.2")>
<Assembly: AssemblyVersion("1.1.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@ -1116,12 +1116,11 @@ Public Class frmMain
Dim oActiveDirectory As New ActiveDirectoryInterface(MyLogConfig, MyConfig.Config.AdRootPath)
Await Task.Run(Sub()
Dim oAuth = oActiveDirectory.Authenticate()
Dim groups = oActiveDirectory.ListGroups(MyConfig.Config.AdGroupFilter)
Dim frm As New frmADDebug_Groups()
frm.DebugData = groups
frm.ShowDialog()
End Sub)
btnDebugGroupQuery.Text = "Abfrage starten"
@ -1158,16 +1157,18 @@ Public Class frmMain
End Sub
Private Sub BindingNavigatorDeleteItem1_Click(sender As Object, e As EventArgs) Handles BindingNavigatorDeleteItem1.Click
If MessageBox.Show("Wollen Sie die ausgewählte Gruppe löschen? Bestehende Benutzer-Zuordnungen werden entfernt", Text, MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then
Try
Validate()
TBDD_GROUPSBindingSource1.EndEdit()
TBDD_GROUPSTableAdapter.Delete(GUIDTextBox1.Text)
Dim oGroupId = GUIDTextBox1.Text
Dim oGroupName = NAMETextBox1.Text
Dim oMessage = String.Format("Wollen sie die Gruppe {0} löschen?", oGroupName)
If MessageBox.Show(oMessage, "Gruppe löschen", MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then
Dim osql = $"EXEC PRDD_DELETE_GROUP {oGroupId}"
If MyDatabase.GetScalarValue(osql) = -1 Then
MessageBox.Show("Fehler beim Löschen der Gruppe.", "Gruppe löschen", MessageBoxButtons.OK, MessageBoxIcon.Warning)
Else
UpdateSavedLabel()
Catch ex As Exception
ShowErrorMessage($"Error while deleting group", ex)
End Try
LoadData()
End If
End If
End Sub
End Class