Fix SQL Command being overwritten for auto indexes, allow placeholders for manual indexes default value

This commit is contained in:
Jonathan Jenne
2020-07-09 12:01:10 +02:00
parent 1dc95d862f
commit b5708b851b
7 changed files with 2037 additions and 1725 deletions

View File

@@ -1652,7 +1652,7 @@ Public Class frmIndex
Dim DefaultValue = Check_HistoryValues(oControlName, oRow.Item("DOKUMENTART"))
If DefaultValue Is Nothing Then
DefaultValue = oRow.Item("DEFAULT_VALUE")
DefaultValue = GetPlaceholderValue(oRow.Item("DEFAULT_VALUE"), CURRENT_WORKFILE, USER_SHORTNAME)
End If
Select Case oDataType
Case "BOOLEAN"
@@ -1751,9 +1751,9 @@ Public Class frmIndex
oResult = oOwner
Case "$DateDDMMYYY".ToUpper
oResult = System.DateTime.Now.ToShortDateString
Case "$Username"
Case "$Username".ToUpper
oResult = Environment.UserName
Case "$Usercode"
Case "$Usercode".ToUpper
oResult = UserShortName
End Select
Catch ex As Exception