diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index 601054d..e85e15e 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -118,10 +118,6 @@ Partial Class frmAdministration Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem28 = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPageUserGroups = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageEmail = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -129,6 +125,8 @@ Partial Class frmAdministration Me.RibbonPageGroupManualIndexFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupAutoIndex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupProfileRegex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageEmail = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.Label12 = New System.Windows.Forms.Label() Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl() @@ -525,7 +523,7 @@ Partial Class frmAdministration resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 38 Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageUserGroups, Me.RibbonPageEmail}) + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageEmail}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 @@ -747,35 +745,6 @@ Partial Class frmAdministration Me.BarButtonItem28.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem28.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem28.Name = "BarButtonItem28" ' - 'RibbonPageUserGroups - ' - Me.RibbonPageUserGroups.Appearance.BackColor = System.Drawing.Color.SeaGreen - Me.RibbonPageUserGroups.Appearance.Options.UseBackColor = True - Me.RibbonPageUserGroups.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3}) - Me.RibbonPageUserGroups.Name = "RibbonPageUserGroups" - resources.ApplyResources(Me.RibbonPageUserGroups, "RibbonPageUserGroups") - ' - 'RibbonPageGroup3 - ' - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem6) - Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") - ' - 'RibbonPageEmail - ' - Me.RibbonPageEmail.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4}) - Me.RibbonPageEmail.Name = "RibbonPageEmail" - resources.ApplyResources(Me.RibbonPageEmail, "RibbonPageEmail") - ' - 'RibbonPageGroup4 - ' - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem9) - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem10) - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem11) - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem12) - Me.RibbonPageGroup4.Name = "RibbonPageGroup4" - resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") - ' 'RibbonPageStart ' Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1, Me.RibbonPageGroupManualIndex, Me.RibbonPageGroupManualIndexFunctions, Me.RibbonPageGroupAutoIndex, Me.RibbonPageGroupProfileRegex}) @@ -839,6 +808,21 @@ Partial Class frmAdministration Me.RibbonPageGroupProfileRegex.Name = "RibbonPageGroupProfileRegex" resources.ApplyResources(Me.RibbonPageGroupProfileRegex, "RibbonPageGroupProfileRegex") ' + 'RibbonPageEmail + ' + Me.RibbonPageEmail.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4}) + Me.RibbonPageEmail.Name = "RibbonPageEmail" + resources.ApplyResources(Me.RibbonPageEmail, "RibbonPageEmail") + ' + 'RibbonPageGroup4 + ' + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem9) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem10) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem11) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem12) + Me.RibbonPageGroup4.Name = "RibbonPageGroup4" + resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.txtStatus) @@ -2925,8 +2909,6 @@ Partial Class frmAdministration Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageUserGroups As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents Label12 As Label diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index 25c778b..d179874 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -841,12 +841,6 @@ Profil-Verwaltung - - Gruppenzuordnung - - - Profil-Zuordnung - E-Mail Indexierung @@ -7500,30 +7494,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageUserGroups - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup3 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageEmail - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup4 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPageStart @@ -7566,6 +7536,18 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageEmail + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup4 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + viewAssignedGroups diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 82a1260..58534ec 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -48,7 +48,6 @@ Public Class frmAdministration oDragDropManager.AddGridView(viewAssignedUsers) oDragDropManager.AddGridView(viewAvailableUsers) - RibbonPageUserGroups.Visible = False RibbonPageEmail.Visible = False Dim oDatatable As New DataTable() @@ -218,7 +217,6 @@ Public Class frmAdministration End Try TBDD_DOKUMENTARTTableAdapter.Update(MyDataset.TBDD_DOKUMENTART) - MaybeDisableUserAndEmailTabs() If IsInsert = True Then Dim oNewID As Integer @@ -229,8 +227,12 @@ Public Class frmAdministration MsgBox("Fehler beim zuweisen des neuen Profils zum Modul Global-Indexer!", MsgBoxStyle.Critical, Text) End If End If + + TBDD_DOKUMENTARTBindingSource.ResetBindings(True) End If + MaybeDisableUserAndEmailTabs() + SetStatus("Profil gespeichert!") Else ClearStatus() @@ -494,21 +496,12 @@ Public Class frmAdministration RibbonControl1.SelectedPage = RibbonPageStart End If - If oSelectedPageName = XtraTabPageUsersGroups.Name Then - RibbonPageUserGroups.Visible = True - RibbonControl1.SelectedPage = RibbonPageUserGroups - Else - RibbonPageUserGroups.Visible = False - 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 @@ -1098,6 +1091,7 @@ Public Class frmAdministration If ClassDatabase.Execute_non_Query(del, True) = True Then Load_Dokart() MaybeDisableUserAndEmailTabs() + TBDD_DOKUMENTARTBindingSource.ResetBindings(True) If USER_LANGUAGE = "de-DE" Then MsgBox("Das Profil wurde erfolgreich gelöscht!", MsgBoxStyle.Information) @@ -1133,7 +1127,9 @@ Public Class frmAdministration MsgBox("Profile was copied successfully and set to INACTIVE." & vbNewLine & "Please note:" & vbNewLine & "- Profile was not assigned to a usergroup", MsgBoxStyle.Information) End If + Load_Dokart() + TBDD_DOKUMENTARTBindingSource.ResetBindings(True) End If Catch ex As Exception MsgBox("Error in Copy Doctype:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -1399,15 +1395,6 @@ Public Class frmAdministration End Try End Sub - Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem6.ItemClick - If DOKART_GUIDTextBox.Text <> String.Empty Then - Dim profileId As Integer = DOKART_GUIDTextBox.Text - - gridAssignedUsers.DataSource = ClassDatatables.GetAssignedUsers(profileId) - gridAvailableUsers.DataSource = ClassDatatables.GetAvailableUsers(profileId) - End If - End Sub - Private Sub BarButtonItem28_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem28.ItemClick TBGI_REGEX_DOCTYPEBindingSource.AddNew()