diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index ff36a1e..65251b1 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -3172,7 +3172,7 @@ Public Class frmConstructor_Main End If TabWindream.Text = stg End If - Dim sel = String.Format("SELECT * FROM TBPMO_RECORD WHERE RECORD_ENTITY_ID = (SELECT RECORD_ENTITY_ID FROM TBPMO_RECORD WHERE GUID = {0}) AND FORM_ID = {1} AND GUID <> {2}", SELECTED_RECORD_ID, ENTITY_ID, SELECTED_RECORD_ID) + Dim sel = String.Format("SELECT * FROM TBPMO_RECORD WHERE RECORD_ENTITY_ID = (SELECT RECORD_ENTITY_ID FROM TBPMO_RECORD WHERE GUID = {0}) AND FORM_ID = {1} AND GUID <> {2} AND DELETED = 0", SELECTED_RECORD_ID, ENTITY_ID, SELECTED_RECORD_ID) Dim DT_VARIANT As DataTable = ClassDatabase.Return_Datatable(sel, True) If DT_VARIANT.Rows.Count > 0 Then TabPageVariant.PageVisible = True diff --git a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.vb b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.vb index 569f44b..f775460 100644 --- a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.vb +++ b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.vb @@ -113,7 +113,7 @@ Public Class frmRecOrgConfig_Basic 'End If Dim upd = String.Format("UPDATE TBPMO_KONFIGURATION SET WIKI_STRING = '{0}', CHANGED_WHO = '{1}', WD_UNICODE = {2} WHERE GUID = 1", Me.txtWiki.Text, USER_USERNAME, wduni) - If ClassDatabase.Execute_non_Query(upd, True) = True Then + If ClassDatabase.Execute_non_Query(upd) = True Then lblSaveresult.Visible = True Else lblSaveresult.Visible = False @@ -237,4 +237,7 @@ Public Class frmRecOrgConfig_Basic End If End Sub + Private Sub txtWiki_VisibleChanged(sender As Object, e As EventArgs) Handles txtWiki.VisibleChanged + + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmWD_IndexFile.vb b/app/DD-Record-Organizer/frmWD_IndexFile.vb index b53786e..735bdc1 100644 --- a/app/DD-Record-Organizer/frmWD_IndexFile.vb +++ b/app/DD-Record-Organizer/frmWD_IndexFile.vb @@ -45,6 +45,7 @@ Public Class frmWD_IndexFile End If sw.Done() sw = New SW("CheckFileExists") + If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer) = True Then sw.Done() Dim msg = "Eine Datei mit identischem Namen existiert bereits! Wollen Sie die bestehende Datei ersetzen?" @@ -72,6 +73,7 @@ Public Class frmWD_IndexFile sw.Done() '################################################################# If streamresult = True Then + sw = New SW("File Indexing") CURRENT_FILEIN_WD = CURRENT_NEWFILENAME Dim sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE ACTIVE = 1 AND UPPER(INDEXNAME) NOT LIKE UPPER('%ONLY %') AND SQL_ACTIVE = 0 AND DOCTYPE_ID = " & vDokart_ID