Merge branch 'master' of http://dd-vmp07-com04:3000/SchreiberM/GlobalIndexer

Global_Indexer/My Project/AssemblyInfo.vb

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.0.0.17")>
+<Assembly: AssemblyVersion("2.0.0.18")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

Global_Indexer/frmAdministration.vb

@@ -62,10 +62,13 @@ Public Class frmAdministration
         ComboBox3.DataSource = oDatatable
 
         Try
-            Me.TBDD_DOKUMENTARTTableAdapter.Fill(Me.MyDataset.TBDD_DOKUMENTART)
+            Me.TBDD_DOKUMENTARTTableAdapter.FillByModuleGI(Me.MyDataset.TBDD_DOKUMENTART)
             Me.TBDD_EINGANGSARTENTableAdapter.Fill(Me.MyDataset.TBDD_EINGANGSARTEN)
             Me.TBDD_MODULESTableAdapter.Fill(Me.MyDataset.TBDD_MODULES)
 
+            TBDD_DOKUMENTARTBindingSource.ResetBindings(True)
+            MaybeDisableUserAndEmailTabs()
+
             ' Initialize Profile-GridControl before its tab is loaded
             ' prevents jumping of selected profile when selected tab is changed
             GridControl3.ForceInitialize()
@@ -77,6 +80,17 @@ Public Class frmAdministration
             End If
         End If
     End Sub
+
+    Private Sub MaybeDisableUserAndEmailTabs()
+        If MyDataset.TBDD_DOKUMENTART.Rows.Count = 0 Then
+            XtraTabPageUsersGroups.PageEnabled = False
+            XtraTabPageEmail.PageEnabled = False
+        Else
+            XtraTabPageUsersGroups.PageEnabled = True
+            XtraTabPageEmail.PageEnabled = True
+        End If
+    End Sub
+
     Private Sub ObjektTypenEintragen()
         Try
             pnlObjekttype_Config.Enabled = False
@@ -204,6 +218,7 @@ Public Class frmAdministration
                 End Try
 
                 TBDD_DOKUMENTARTTableAdapter.Update(MyDataset.TBDD_DOKUMENTART)
+                MaybeDisableUserAndEmailTabs()
 
                 If IsInsert = True Then
                     Dim oNewID As Integer
@@ -336,14 +351,20 @@ Public Class frmAdministration
         If DOKART_GUIDTextBox.Text <> "" Then
             Load_Dokart()
             'Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text)
+            If DOKART_GUIDTextBox.Text <> String.Empty Then
                 Load_ZuordnungDokart_Module(DOKART_GUIDTextBox.Text)
+            End If
+
             If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then
                 btnSQLView.Visible = True
             Else
                 btnSQLView.Visible = False
             End If
+            If DOKART_GUIDTextBox.Text <> String.Empty Then
                 Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text)
             End If
+
+        End If
         frmloaded = True
         WM_CHECKED_CHANGE()
     End Sub
@@ -1076,7 +1097,7 @@ Public Class frmAdministration
                 Dim del As String = " EXEC PRDD_GLOBIX_DELETE_DOCTYPE " & DOKART_GUIDTextBox.Text
                 If ClassDatabase.Execute_non_Query(del, True) = True Then
                     Load_Dokart()
-
+                    MaybeDisableUserAndEmailTabs()
 
                     If USER_LANGUAGE = "de-DE" Then
                         MsgBox("Das Profil wurde erfolgreich gelöscht!", MsgBoxStyle.Information)
@@ -1122,6 +1143,7 @@ Public Class frmAdministration
 
     Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick
         LoadGlobix_Doctypes()
+        MaybeDisableUserAndEmailTabs()
     End Sub
 
     Private Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem5.ItemClick