AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

frmAdministration: Fix Index Loading (again), fix user/group assignments not loading when only 1 profile exists

Browse Source
This commit is contained in:
Jonathan Jenne 2020-04-28 13:41:57 +02:00
parent 59a44ae6fc
commit 94fa4c15a3
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Global_Indexer/frmAdministration.vb
View File

@ -312,16 +312,15 @@ Public Class frmAdministration
End Sub End Sub
Sub load_WDIndices() Sub load_WDIndices()
Try Try
If Me.OBJEKTTYPComboBox.SelectedIndex <> -1 Then If OBJEKTTYPComboBox.Text <> "" Then
Me.WD_INDEXComboBox.Items.Clear() Me.WD_INDEXComboBox.Items.Clear()
Me.WD_INDEXComboBox.Items.Add("") Me.WD_INDEXComboBox.Items.Add("")
Me.INDEXNAME_AutoIndexCMB.Items.Clear() Me.INDEXNAME_AutoIndexCMB.Items.Clear()
If SourceAttributes Is Nothing Then If SourceAttributes Is Nothing Then
SourceAttributes = WINDREAM.GetIndiciesByObjecttype(OBJEKTTYPComboBox.Text) SourceAttributes = WINDREAM.GetIndiciesByObjecttype(OBJEKTTYPComboBox.Text)
End If End If
If SourceAttributes IsNot Nothing Then If SourceAttributes IsNot Nothing Then
For Each index As String In SourceAttributes For Each index As String In SourceAttributes
Me.WD_INDEXComboBox.Items.Add(index) Me.WD_INDEXComboBox.Items.Add(index)
@ -333,6 +332,8 @@ Public Class frmAdministration
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in load_WDIndices: ") MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in load_WDIndices: ")
End Try End Try
End Sub End Sub
Private Sub frmAdministration_Shown(sender As Object, e As EventArgs) Handles Me.Shown Private Sub frmAdministration_Shown(sender As Object, e As EventArgs) Handles Me.Shown
If DOKART_GUIDTextBox.Text <> "" Then If DOKART_GUIDTextBox.Text <> "" Then
Load_Dokart() Load_Dokart()
@ -473,14 +474,19 @@ Public Class frmAdministration
RibbonControl1.SelectedPage = RibbonPageStart RibbonControl1.SelectedPage = RibbonPageStart
End If 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 If oSelectedPageName = XtraTabPageEmail.Name Then
RibbonPageEmail.Visible = True RibbonPageEmail.Visible = True
If oSelectedPageName = XtraTabPageEmail.Name Then If oSelectedPageName = XtraTabPageEmail.Name Then
RibbonControl1.SelectedPage = RibbonPageEmail RibbonControl1.SelectedPage = RibbonPageEmail
End If End If
Else Else
RibbonPageEmail.Visible = False RibbonPageEmail.Visible = False
End If End If
@ -1242,6 +1248,10 @@ Public Class frmAdministration
Private Sub BarButtonItem16_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem16.ItemClick Private Sub BarButtonItem16_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem16.ItemClick
TBDD_INDEX_MANBindingSource.AddNew() TBDD_INDEX_MANBindingSource.AddNew()
If WINDREAM_DIRECTCheckBox.Checked = True Then
load_WDIndices()
End If
End Sub End Sub
Private Sub BarButtonItem17_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem17.ItemClick 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 Private Sub BarButtonItem24_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem24.ItemClick
TBDD_INDEX_AUTOMBindingSource.AddNew() TBDD_INDEX_AUTOMBindingSource.AddNew()
If WINDREAM_DIRECTCheckBox.Checked = True Then
load_WDIndices()
End If
End Sub End Sub
Private Sub ToolStripButton17_Click(sender As Object, e As EventArgs) Private Sub ToolStripButton17_Click(sender As Object, e As EventArgs)