MS merge DEsign
This commit is contained in:
commit
8097017f9f
4
.gitignore
vendored
4
.gitignore
vendored
@ -154,5 +154,5 @@ $RECYCLE.BIN/
|
|||||||
|
|
||||||
# Mac desktop service store files
|
# Mac desktop service store files
|
||||||
.DS_Store
|
.DS_Store
|
||||||
/.vs/Global_Indexer/v15/Server/sqlite3
|
|
||||||
/.vs/Global_Indexer/v16/Server/sqlite3
|
/.vs
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +0,0 @@
|
|||||||
{
|
|
||||||
"CurrentProjectSetting": null
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"ExpandedNodes": [
|
|
||||||
""
|
|
||||||
],
|
|
||||||
"SelectedNode": "\\Global_Indexer.sln",
|
|
||||||
"PreviewInSolutionExplorer": false
|
|
||||||
}
|
|
||||||
BIN
.vs/slnx.sqlite
BIN
.vs/slnx.sqlite
Binary file not shown.
@ -527,12 +527,13 @@ Public Class frmAdministration
|
|||||||
|
|
||||||
Dim oDatatable = DATABASE_ECM.GetDatatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocTypeGuid} AND ACTIVE = 1")
|
Dim oDatatable = DATABASE_ECM.GetDatatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocTypeGuid} AND ACTIVE = 1")
|
||||||
Dim oPlaceholders = oDatatable.AsEnumerable().
|
Dim oPlaceholders = oDatatable.AsEnumerable().
|
||||||
ToDictionary(Of String, String)(Function(row) row.Item("NAME"), Function(row) row.Item("WD_INDEX"))
|
ToDictionary(Of String, String)(Function(row) row.Item("NAME"), Function(row) row.Item("NAME"))
|
||||||
|
|
||||||
Dim oForm2 As New DigitalData.GUIs.Common.frmSQLEditor(LOGCONFIG, DATABASE_ECM) With {
|
Dim oForm2 As New DigitalData.GUIs.Common.frmSQLEditor(LOGCONFIG, DATABASE_ECM) With {
|
||||||
.SQLCommand = oSQLCommand,
|
.SQLCommand = oSQLCommand,
|
||||||
.SQLConnection = oConnection,
|
.SQLConnection = oConnection,
|
||||||
.PlaceholdersManual = oPlaceholders
|
.PlaceholdersManual = oPlaceholders,
|
||||||
|
.PlaceholdersManualPrefix = "CTRL"
|
||||||
}
|
}
|
||||||
|
|
||||||
Dim oResult = oForm2.ShowDialog()
|
Dim oResult = oForm2.ShowDialog()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user