Merge branch 'master' of http://scmadmin@172.24.11.74:90/scm/git/RecordOrganizer
This commit is contained in:
@@ -1101,7 +1101,9 @@ Public Class frmConstructor_Main
|
||||
elapsed = sw.Elapsed.TotalSeconds
|
||||
If LogErrorsOnly = False Then ClassLogger.Add(" >> Load_Tree_View_Data1 took " & Format(elapsed, "0.000000000") & " seconds", False)
|
||||
Get_RecordCounts_Nodes()
|
||||
|
||||
Load_Entity_Data(ACT_EBENE)
|
||||
|
||||
sw.Stop()
|
||||
sw.Reset()
|
||||
elapsed = elapsed - sw.Elapsed.TotalSeconds
|
||||
@@ -1445,7 +1447,7 @@ Public Class frmConstructor_Main
|
||||
Me.Cursor = Cursors.Default
|
||||
Return False
|
||||
End If
|
||||
If EditState.Insert = 1 Then
|
||||
If EDIT_STATE = EditState.Insert Then
|
||||
Select Case ACT_EBENE
|
||||
Case 1
|
||||
EBENE1_RECID = recid
|
||||
@@ -2165,8 +2167,6 @@ Public Class frmConstructor_Main
|
||||
ENTITY_LOADED = True
|
||||
End If
|
||||
|
||||
|
||||
|
||||
sw.Done()
|
||||
|
||||
If ENTITY_RELOAD_AFT_CONTROL_LOAD = True Then
|
||||
@@ -5242,7 +5242,7 @@ Public Class frmConstructor_Main
|
||||
''' </returns>
|
||||
Public Function TrySave_User() As Boolean
|
||||
Try
|
||||
EDIT_STATE = EditState.None
|
||||
'EDIT_STATE = EditState.None
|
||||
'Update_Status_Label(False)
|
||||
|
||||
If RECORD_CHANGED = False Then
|
||||
@@ -5340,4 +5340,8 @@ Public Class frmConstructor_Main
|
||||
Private Sub grvwGrid_CellValueChanged(sender As Object, e As CellValueChangedEventArgs) Handles grvwGrid.CellValueChanged
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub SucheAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SucheAnzeigenToolStripMenuItem.Click
|
||||
grvwGrid.ShowFindPanel()
|
||||
End Sub
|
||||
End Class
|
||||
Reference in New Issue
Block a user