MS merge DEsign

2023-03-28 13:56:07 +02:00 · 2023-03-28 13:56:07 +02:00 · 8097017f9f
commit 8097017f9f
parent 42cc852775 8edac6bb6a
15 changed files with 5 additions and 14 deletions
--- a/.gitignore
+++ b/.gitignore
@ -154,5 +154,5 @@ $RECYCLE.BIN/

 # Mac desktop service store files
 .DS_Store
-/.vs/Global_Indexer/v15/Server/sqlite3
-/.vs/Global_Indexer/v16/Server/sqlite3
+
+/.vs
--- a/.vs/FileFlow/DesignTimeBuild/.dtbcache
+++ b/.vs/FileFlow/DesignTimeBuild/.dtbcache
--- a/.vs/FileFlow/FileContentIndex/c902896a-6cdf-46ab-8ff4-fd887ce202e7.vsidx
+++ b/.vs/FileFlow/FileContentIndex/c902896a-6cdf-46ab-8ff4-fd887ce202e7.vsidx
--- a/.vs/FileFlow/FileContentIndex/ca99cb38-d1fb-46cf-b662-08bc2a5c3d3a.vsidx
+++ b/.vs/FileFlow/FileContentIndex/ca99cb38-d1fb-46cf-b662-08bc2a5c3d3a.vsidx
--- a/.vs/FileFlow/FileContentIndex/read.lock
+++ b/.vs/FileFlow/FileContentIndex/read.lock
--- a/.vs/FileFlow/v15/Server/sqlite3/db.lock
+++ b/.vs/FileFlow/v15/Server/sqlite3/db.lock
--- a/.vs/FileFlow/v15/Server/sqlite3/storage.ide
+++ b/.vs/FileFlow/v15/Server/sqlite3/storage.ide
--- a/.vs/FileFlow/v15/Server/sqlite3/storage.ide-shm
+++ b/.vs/FileFlow/v15/Server/sqlite3/storage.ide-shm
--- a/.vs/FileFlow/v15/Server/sqlite3/storage.ide-wal
+++ b/.vs/FileFlow/v15/Server/sqlite3/storage.ide-wal
--- a/.vs/FileFlow/v16/Server/sqlite3/db.lock
+++ b/.vs/FileFlow/v16/Server/sqlite3/db.lock
--- a/.vs/FileFlow/v16/Server/sqlite3/storage.ide
+++ b/.vs/FileFlow/v16/Server/sqlite3/storage.ide
--- a/.vs/ProjectSettings.json
+++ b/.vs/ProjectSettings.json
@ -1,3 +0,0 @@
-{
-  "CurrentProjectSetting": null
-}
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\Global_Indexer.sln",
-  "PreviewInSolutionExplorer": false
-}
--- a/.vs/slnx.sqlite
+++ b/.vs/slnx.sqlite
--- a/Global_Indexer/frmAdministration.vb
+++ b/Global_Indexer/frmAdministration.vb
@ -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 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 {
                .SQLCommand = oSQLCommand,
                .SQLConnection = oConnection,
-                .PlaceholdersManual = oPlaceholders
+                .PlaceholdersManual = oPlaceholders,
+                .PlaceholdersManualPrefix = "CTRL"
            }

            Dim oResult = oForm2.ShowDialog()