From 94fa4c15a349f0bfbdcb2845be13bbe9406a19ae Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Tue, 28 Apr 2020 13:41:57 +0200
Subject: [PATCH] frmAdministration: Fix Index Loading (again), fix user/group
 assignments not loading when only 1 profile exists

---
 Global_Indexer/frmAdministration.vb | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb
index dc4dc9c..0a4338a 100644
--- a/Global_Indexer/frmAdministration.vb
+++ b/Global_Indexer/frmAdministration.vb
@@ -312,16 +312,15 @@ Public Class frmAdministration
     End Sub
     Sub load_WDIndices()
         Try
-            If Me.OBJEKTTYPComboBox.SelectedIndex <> -1 Then
+            If OBJEKTTYPComboBox.Text <> "" Then
                 Me.WD_INDEXComboBox.Items.Clear()
                 Me.WD_INDEXComboBox.Items.Add("")
                 Me.INDEXNAME_AutoIndexCMB.Items.Clear()
+
                 If SourceAttributes Is Nothing Then
                     SourceAttributes = WINDREAM.GetIndiciesByObjecttype(OBJEKTTYPComboBox.Text)
                 End If
 
-
-
                 If SourceAttributes IsNot Nothing Then
                     For Each index As String In SourceAttributes
                         Me.WD_INDEXComboBox.Items.Add(index)
@@ -333,6 +332,8 @@ Public Class frmAdministration
             MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in load_WDIndices: ")
         End Try
     End Sub
+
+
     Private Sub frmAdministration_Shown(sender As Object, e As EventArgs) Handles Me.Shown
         If DOKART_GUIDTextBox.Text <> "" Then
             Load_Dokart()
@@ -473,14 +474,19 @@ Public Class frmAdministration
             RibbonControl1.SelectedPage = RibbonPageStart
         End If
 
+        If oSelectedPageName = XtraTabPageUsersGroups.Name And DOKART_GUIDTextBox.Text <> "" Then
+            gridAssignedGroups.DataSource = ClassDatatables.GetAssignedGroups(DOKART_GUIDTextBox.Text)
+            gridAvailableGroups.DataSource = ClassDatatables.GetAvailableGroups(DOKART_GUIDTextBox.Text)
+            gridAssignedUsers.DataSource = ClassDatatables.GetAssignedUsers(DOKART_GUIDTextBox.Text)
+            gridAvailableUsers.DataSource = ClassDatatables.GetAvailableUsers(DOKART_GUIDTextBox.Text)
+        End If
+
         If oSelectedPageName = XtraTabPageEmail.Name Then
             RibbonPageEmail.Visible = True
 
             If oSelectedPageName = XtraTabPageEmail.Name Then
                 RibbonControl1.SelectedPage = RibbonPageEmail
             End If
-
-
         Else
             RibbonPageEmail.Visible = False
         End If
@@ -1242,6 +1248,10 @@ Public Class frmAdministration
 
     Private Sub BarButtonItem16_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem16.ItemClick
         TBDD_INDEX_MANBindingSource.AddNew()
+
+        If WINDREAM_DIRECTCheckBox.Checked = True Then
+            load_WDIndices()
+        End If
     End Sub
 
     Private Sub BarButtonItem17_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem17.ItemClick
@@ -1317,6 +1327,10 @@ Public Class frmAdministration
 
     Private Sub BarButtonItem24_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem24.ItemClick
         TBDD_INDEX_AUTOMBindingSource.AddNew()
+
+        If WINDREAM_DIRECTCheckBox.Checked = True Then
+            load_WDIndices()
+        End If
     End Sub
 
     Private Sub ToolStripButton17_Click(sender As Object, e As EventArgs)