From 7f63396433a312fd114ace7e6191387bea0c29ba Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Tue, 15 Dec 2015 07:26:33 +0100 Subject: [PATCH] MS_15.12 --- app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index dfef9de..70605ef 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -1441,7 +1441,12 @@ Public Class frmForm_Constructor_Main_2 If GET_GROUP_OR_SINGLE_RECORD(PARENT_RECORDID, True) = True Then ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! RECORD_CHANGED = False - Show_Selected_Record_Data(CURRENT_RECORD_ID, True) + If IS_SINGLE_RECORD Then + Show_Selected_Record_Data(CURRENT_RECORD_ID, True) + Else + Refresh_Navpane() + Update_Record_Label(SELECTED_RECORD_ID) + End If Get_RecordCounts_Nodes() End If @@ -1795,7 +1800,7 @@ Public Class frmForm_Constructor_Main_2 Dim sql As String = String.Format("SELECT T.RECORD2_ID FROM TBPMO_RECORD_CONNECT T, TBPMO_RECORD T1 WHERE T.RECORD2_ID = T1.GUID AND T.RECORD1_ID = {0} and T1.FORM_ID = {1}", LINKED_RECORD, CURRENT_FORM_ID) ' Dim sqlRecord As String = String.Format("SELECT T.RECORD2_ID FROM TBPMO_RECORD_CONNECT T, TBPMO_RECORD T1 WHERE T.RECORD2_ID = T1.GUID AND T.RECORD1_ID = {0} AND T1.FORM_ID = (SELECT PARENT_ID FROM TBPMO_FORM WHERE GUID = {1})", LINKED_RECORD, CURRENT_FORM_ID) Dim PARENT_RECORD = ClassDatabase.Execute_Scalar(sql, True) - Dim LINK_EXISTS = String.Format("SELECT COUNT(T.GUID) FROM TBPMO_RECORD_CONNECT T, TBPMO_RECORD T1 WHERE T.RECORD2_ID = T1.GUID AND T.RECORD1_ID = {0} and T1.FORM_ID = {1}", PARENT_RECORD, CURRENT_FORM_ID) + Dim LINK_EXISTS = String.Format("SELECT COUNT(T.GUID) FROM TBPMO_RECORD_CONNECT T, TBPMO_RECORD T1 WHERE T.RECORD2_ID = T1.GUID AND T.RECORD2_ID = {0} and T1.FORM_ID = {1}", PARENT_RECORD, CURRENT_FORM_ID) If ClassDatabase.Execute_Scalar(LINK_EXISTS) = 0 Then If ClassControlCommandsUI.CreateRecord(CURRENT_FORM_ID) = True Then Dim New_Record = ClassControlCommandsUI.GetLastRecord