AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS

Browse Source
This commit is contained in:
SchreiberM
2016-08-24 16:55:08 +02:00
parent cf2fa721de
commit 3cf078e784
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/DD-Record-Organiser/ClassControlBuilder.vb
View File

@@ -563,7 +563,6 @@ Public Class ClassControlBuilder
' Use the Select method to find all rows matching the filter. ' Use the Select method to find all rows matching the filter.
foundControls = CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS.Select(expression) foundControls = CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS.Select(expression)
Dim i As Integer Dim i As Integer
Dim NODE_CONFIG_ID
' Check if control is one of rightcontrols ' Check if control is one of rightcontrols
For i = 0 To foundControls.GetUpperBound(0) For i = 0 To foundControls.GetUpperBound(0)
If foundControls(i)("CONTROL_ID") = CONTROL_ID Then If foundControls(i)("CONTROL_ID") = CONTROL_ID Then

2
app/DD-Record-Organiser/ClassControlLoader.vb
View File

@@ -454,7 +454,7 @@
End If End If
End While End While
Next Next
If CtrlCommandUI.IsInsert Or CtrlCommandUI.IsEdit Then If CtrlCommandUI.IsEdit Then
CURRENT_RECORD_ENABLED = True CURRENT_RECORD_ENABLED = True
End If End If

17
app/DD-Record-Organiser/frmConstructor_Main.vb
View File

@@ -828,6 +828,7 @@ Public Class frmConstructor_Main
Else Else
If CtrlCommandUI.IsInsert Then If CtrlCommandUI.IsInsert Then
ActivateAllTabs() ActivateAllTabs()
CtrlCommandUI.IsInsert = False
End If End If
End If End If
End Sub End Sub
@@ -2322,11 +2323,6 @@ Public Class frmConstructor_Main
Lock_RecordControls(True) Lock_RecordControls(True)
RECORD_ENABLED = False RECORD_ENABLED = False
CURRENT_RECORD_ENABLED = False CURRENT_RECORD_ENABLED = False
If Not IsNothing(CtrlCommandUI) Then
CtrlCommandUI.IsEdit = False
CtrlCommandUI.IsInsert = False
End If
Me.tsButtonDelete.Enabled = False Me.tsButtonDelete.Enabled = False
Me.tsButtonAdd.Enabled = True Me.tsButtonAdd.Enabled = True
@@ -2343,11 +2339,17 @@ Public Class frmConstructor_Main
If Not IsNothing(CtrlCommandUI) Then If Not IsNothing(CtrlCommandUI) Then
ActivateAllTabs() ActivateAllTabs()
End If End If
If RECORD_ENABLED = True Then If RECORD_ENABLED = True Then
ClassControlValues.UnloadControlValuesList(SELECTED_RECORD_ID, RECORD_ID, CtrlBuilder.AllControls) ClassControlValues.UnloadControlValuesList(SELECTED_RECORD_ID, RECORD_ID, CtrlBuilder.AllControls)
End If End If
If Not IsNothing(CtrlCommandUI) Then
'If CtrlCommandUI.IsInsert Then
' CtrlCommandUI.IsInsert = False
'End If
If CtrlCommandUI.IsEdit Then
CtrlCommandUI.IsEdit = False
End If
End If
End Sub End Sub
@@ -3081,6 +3083,7 @@ Public Class frmConstructor_Main
'End Try 'End Try
End If End If
CtrlCommandUI.IsEdit = False
CtrlCommandUI.IsInsert = False CtrlCommandUI.IsInsert = False
RECORD_CHANGED = False RECORD_CHANGED = False
End If End If