Merge mit Branch 2.5.4.0
This commit is contained in:
@@ -208,6 +208,7 @@ Public Class ClassInit
|
||||
' We initialize the Class in anycase.
|
||||
' If there is no client, it will fall back to the db by itself
|
||||
DatabaseFallback = New DatabaseWithFallback(LOGCONFIG, _Client, Database_ECM, Database_IDB)
|
||||
|
||||
If dbECMInitialized = True And CONNECTION_STRING_IDB = String.Empty Then
|
||||
Return True
|
||||
ElseIf dbECMInitialized = True And CONNECTION_STRING_IDB <> String.Empty Then
|
||||
@@ -501,7 +502,6 @@ Public Class ClassInit
|
||||
BASEDATA_DT_GUI_LANGUAGE_PHRASES = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE_PHRASE", New GetDatatableOptions(oSql, DatabaseType.ECM))
|
||||
oStep = "TBPM_PROFILE_SEARCH"
|
||||
oSql = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
|
||||
'BASEDATA_DT_PROFILES_SEARCHES_DOC = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_PROFILE_SEARCH", "TYPE = 'DOC'", "PROFILE_ID,TAB_INDEX")
|
||||
BASEDATA_DT_PROFILES_SEARCHES_DOC = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSql, DatabaseType.ECM) With {
|
||||
.SortByColumn = "PROFILE_ID,TAB_INDEX"
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user