From 173cbdb49c9721057456b8d46c8d63b6c51303e4 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Fri, 2 Oct 2020 16:46:44 +0200
Subject: [PATCH] Version 1.1.0.0

---
 .../DDUserManager/My Project/AssemblyInfo.vb  |  2 +-
 DDUserManager/DDUserManager/frmMain.vb        | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb
index cc41fb4..1891267 100644
--- a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb	
+++ b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb	
@@ -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")>
diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb
index 7d17043..207f4c8 100644
--- a/DDUserManager/DDUserManager/frmMain.vb
+++ b/DDUserManager/DDUserManager/frmMain.vb
@@ -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