Common: Fix columns in document result list

GUIs.Common/DocumentResultList/frmDocumentResultList.vb

@@ -340,19 +340,24 @@ Public Class frmDocumentResultList
             Next
 
             For Each oRow As DataRow In Result.Datatable.Rows
-                Dim oFullpath = oRow.Item(COLUMN_FILEPATH)
-                Dim oDocID = oRow.Item(COLUMN_DOCID)
-                Dim oFilename = Path.GetFileName(oFullpath)
+                Dim oDocId = TryGetItem(oRow, COLUMN_DOCID)
+                Dim oFullpath = TryGetItem(oRow, COLUMN_FILEPATH)
+                Dim oFilename = TryGetItem(oRow, COLUMN_FILENAME)
+
                 Dim oNewRow As DataRow
                 oNewRow = oDocDatatable.NewRow()
 
-                'Icon zuweisen
-                oNewRow.Item(COLUMN_ICON) = _Helpers.GetIconByExtension(oFullpath)
+                If OperationMode = IResultForm.Mode.NoAppServer Then
+                    oNewRow.Item(COLUMN_ICON) = _Helpers.GetIconByExtension(oFullpath)
+                    oNewRow.Item(COLUMN_FILEPATH) = oFullpath
+                    oNewRow.Item(COLUMN_FILENAME) = oFilename
+                Else
+                    oNewRow.Item(COLUMN_ICON) = _Helpers.GetIconByExtension(oFilename)
+                    oNewRow.Item(COLUMN_FILEPATH) = String.Empty
+                    oNewRow.Item(COLUMN_FILENAME) = oFilename
+                End If
 
-                'Den Filepath mitgeben
-                oNewRow.Item(COLUMN_FILEPATH) = oFullpath
-                oNewRow.Item(COLUMN_DOCID) = oDocID
-                oNewRow.Item(COLUMN_FILENAME) = oFilename
+                oNewRow.Item(COLUMN_DOCID) = oDocId
 
                 Dim oIndex = 4 'Fängt bei 4 an, um die definierten Spalten zu überspringen
                 For Each oColumnName As String In oRestColArray
@@ -387,6 +392,8 @@ Public Class frmDocumentResultList
                 If OperationMode = IResultForm.Mode.WithAppServer Then
                     ' Hide Fullpath completely in AppServer Mode
                     GridView.Columns.Item(COLUMN_FILEPATH).OptionsColumn.ShowInCustomizationForm = False
+                    GridView.Columns.Item(COLUMN_ICON).Visible = False
+                    GridView.Columns.Item(COLUMN_FILEPATH).Visible = False
                 End If
 
                 Dim oCreatedColumn = GridView.Columns(oCreated)
@@ -401,7 +408,7 @@ Public Class frmDocumentResultList
                     oChangedColumn.DisplayFormat.FormatString = _Environment.User.DateFormat & " HH:MM:ss"
                 End If
 
-                ' Alle Spalten aus ReadOnly setzen, danach werden alle passenden auf nicht ReadOnly gesetzt
+                ' Alle Spalten auf ReadOnly setzen, danach werden alle passenden auf nicht ReadOnly gesetzt
                 For Each oColumn As GridColumn In GridView.Columns
                     oColumn.OptionsColumn.AllowEdit = False
                 Next
@@ -419,6 +426,14 @@ Public Class frmDocumentResultList
         End Try
     End Sub
 
+    Private Function TryGetItem(DataRow As DataRow, ColumnName As String, Optional DefaultValue As String = "") As String
+        Try
+            Return DataRow.Item(ColumnName)
+        Catch ex As Exception
+            Return DefaultValue
+        End Try
+    End Function
+
     Private Sub SwitchMainContainerHorizontal_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SwitchMainContainerHorizontal.CheckedChanged
         SplitContainerControl1.Horizontal = SwitchMainContainerHorizontal.Checked