This commit is contained in:
SchreiberM
2016-08-18 10:58:31 +02:00
parent fd0e907262
commit bcee2404d5
30 changed files with 9903 additions and 8876 deletions

View File

@@ -2151,8 +2151,7 @@ Public Class frmConstructor_Main
Dim result As MsgBoxResult
result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then
Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID
If ClassDatabase.Execute_non_Query_withConn(del, 1) = True Then
If ClassHelper.DeleteRecord(SELECTED_RECORD_ID) = True Then
RECORD_CHANGED = False
EDIT_STATE = EditState.None
CURRENT_RECORD_ENABLED = False
@@ -3010,8 +3009,7 @@ Public Class frmConstructor_Main
Else
' Wenn nicht gespeichert werden soll, den Record wieder löschen
If CtrlCommandUI.IsInsert = True Then
Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID
ClassDatabase.Execute_non_Query_withConn(del, 1)
ClassHelper.DeleteRecord(SELECTED_RECORD_ID)
End If
tsButtonAdd.Enabled = True
@@ -5634,6 +5632,7 @@ Public Class frmConstructor_Main
If ClassDatabase.Execute_non_Query(del) = True Then
del = "DELETE FROM TBPMO_DOCRESULT_LIST WHERE DocID = " & RESULT_DOC_ID
If ClassDatabase.Execute_non_Query(del) = True Then
ClassHelper.InsertEssential_Log(RESULT_DOC_ID, "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH")
RUN_WDSEARCH_GRID("RECORD")
End If
End If
@@ -5656,6 +5655,7 @@ Public Class frmConstructor_Main
If Not IsNothing(RESULT_DOC_ID) Then
If ClassWindream.Delete_WDFile(RESULT_DOC_PATH) = True Then
If ClassFileResult.Delete_ResultFile(RESULT_DOC_ID) = True Then
ClassHelper.InsertEssential_Log(RESULT_DOC_ID, "DOC-ID", "FILE DELETED BY USER")
RUN_WDSEARCH_GRID("RECORD")
End If
End If
@@ -5715,8 +5715,7 @@ Public Class frmConstructor_Main
Private Sub tsButtonCancel_Click(sender As Object, e As EventArgs) Handles tsButtonCancel.Click
If CtrlCommandUI.IsInsert = True Then
Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID
ClassDatabase.Execute_non_Query_withConn(del, 1)
ClassHelper.DeleteRecord(SELECTED_RECORD_ID)
End If
tsButtonCancel.Visible = False
tsButtonAdd.Enabled = True
@@ -5850,8 +5849,7 @@ Public Class frmConstructor_Main
Else
' Angelegten Record löschen
If CtrlCommandUI.IsInsert Then
Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}", SELECTED_RECORD_ID)
ClassDatabase.Execute_non_Query_withConn(DeleteRecordSQL, 1)
ClassHelper.DeleteRecord(SELECTED_RECORD_ID)
End If
' Änderungen sollen nicht gespeichert werden
@@ -6173,7 +6171,7 @@ Public Class frmConstructor_Main
Private Sub TestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles tsmiRights.Click
Dim msg = "Die Rechte wurden erfolgreich überprüft und aktualisiert!"
If ClassDOC_SEARCH.SET_WD_RIGHTS(RESULT_DOC_PATH) = True Then
If ClassDOC_SEARCH.SET_WD_RIGHTS(RESULT_DOC_ID, RESULT_DOC_PATH) = True Then
If USER_LANGUAGE <> "de-DE" Then
msg = "The rights were successfully renewed!"
End If