Zooflow: Finish user relations

GUIs.ZooFlow/Administration/frmAdmin_Start.vb

@@ -8,6 +8,7 @@ Imports DigitalData.Modules.Language.Utils
 Imports DigitalData.GUIs.ZooFlow.Administration.ClassConstants
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraBars
+Imports DigitalData.Modules.Language
 
 Public Class frmAdmin_Start
     Private CurrentModule As String
@@ -222,8 +223,13 @@ Public Class frmAdmin_Start
         Try
             Dim oView As GridView = ViewMain
             Dim oRowView As DataRowView = oView.GetRow(RowHandle)
+
+            If oRowView Is Nothing Then
+                Return Nothing
+            End If
+
             Dim oItem As ClassDetailForm.DetailData = CurrentItem
-            Dim oGuid = oRowView.Row.Item(oItem.PrimaryKey)
+            Dim oGuid = oRowView.Row.ItemEx(oItem.PrimaryKey, -1)
 
             Return oGuid
         Catch ex As Exception
@@ -256,13 +262,15 @@ Public Class frmAdmin_Start
 
     Private Sub btnEditRecord_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnEditRecord.ItemClick
         Try
-            If ViewMain.FocusedRowHandle = GridControl.InvalidRowHandle Then
+            Dim oIsRelationPage = DetailForm.TestPageIsRelation(CurrentPage)
+
+            If ViewMain.FocusedRowHandle = GridControl.InvalidRowHandle And Not oIsRelationPage Then
                 Exit Sub
             End If
 
             Dim oPrimaryKey = Get_PrimaryKey(ViewMain.FocusedRowHandle)
 
-            If oPrimaryKey IsNot Nothing Or CurrentPage = PAGE_GI_RELATIONS Then
+            If oPrimaryKey IsNot Nothing Or oIsRelationPage Then
                 DetailForm.Handle_OpenDetail(oPrimaryKey, CurrentPage, False)
             End If
         Catch ex As Exception
@@ -271,7 +279,7 @@ Public Class frmAdmin_Start
     End Sub
 
     Private Sub BarButtonItem27_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem27.ItemClick
-        Dim oForm As New frmAdmin_ImportUser()
+        Dim oForm As New frmAdmin_UserImport()
         oForm.ShowDialog()
     End Sub