MS_0612

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -5796,8 +5796,8 @@ Public Class frmConstructor_Main
             ' Use the Select method to find all rows matching the filter.
             foundRowsLevel0 = CURRENT_DOC_RESULTS.Select(expression)
             Try
-                IW_USER = foundRowsLevel0(0)(13)
-                IW_COMMENT = foundRowsLevel0(0)(14)
+                IW_USER = foundRowsLevel0(0)("IN_WORK_USER")
+                IW_COMMENT = foundRowsLevel0(0)("IN_WORK_COMMENT")
             Catch ex As Exception
                 IW_USER = ""
                 IW_COMMENT = ""
@@ -5808,7 +5808,7 @@ Public Class frmConstructor_Main
             Dim displ As String
 
             If CBool(ClassWindreamDocGrid.SELECTED_INWORK) = True Then
-                If IW_USER.ToUpper = USER_USERNAME.ToUpper Then
+                If IW_USER.ToUpper = USER_USERNAME.ToUpper Or USER_IS_ADMIN Then
                     displ = "Datei wieder freigeben"
                     If USER_LANGUAGE <> "de-DE" Then
                         displ = "Set file free"
@@ -5839,7 +5839,7 @@ Public Class frmConstructor_Main
         ClassFileResult.DocID = ClassWindreamDocGrid.SELECTED_DOC_ID
         If ClassWindreamDocGrid.SELECTED_INWORK = True Then ' Datei ist in Bearbeitung
             Dim displ As String
-            If IW_USER.ToUpper = USER_USERNAME.ToUpper Then
+            If IW_USER.ToUpper = USER_USERNAME.ToUpper Or USER_IS_ADMIN Then
                 If ClassFileResult.Set_InWork(0, "") = True Then
                     RUN_WDSEARCH_GRID("RECORD")
                 End If
@@ -6362,4 +6362,22 @@ Public Class frmConstructor_Main
             tsbtnPanel1Collapse.Image = My.Resources.arrow_left
         End If
     End Sub
+
+    Private Sub CMSEntity_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles CMSEntity.Opening
+        Dim control = Me.ActiveControl
+        Console.WriteLine(control.Name)
+        If Not IsNothing(control) Then
+            If control.Name <> TreeViewMain.Name Then
+                e.Cancel = True
+            End If
+        End If
+    End Sub
+    Private Function FindFocussedControl(ByVal ctr As Control) As Control
+        Dim container As ContainerControl = TryCast(ctr, ContainerControl)
+        Do While (container IsNot Nothing)
+            ctr = container.ActiveControl
+            container = TryCast(ctr, ContainerControl)
+        Loop
+        Return ctr
+    End Function
 End Class