Compare commits

...

4 Commits

Author SHA1 Message Date
Jonathan Jenne
fd4d35195c Version 2.3.0.3 2020-12-14 14:41:43 +01:00
Jonathan Jenne
49d2c70c33 fix replacing of user values in automatic index sql 2020-12-14 14:41:20 +01:00
Jonathan Jenne
5f17b614fb Version 2.3.0.2 2020-12-14 10:24:18 +01:00
Jonathan Jenne
b4c1524939 Replace user value placeholders for auto indicies 2020-12-14 10:23:52 +01:00
3 changed files with 4 additions and 28 deletions

View File

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.3.0.1")> <Assembly: AssemblyVersion("2.3.0.3")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")> <Assembly: NeutralResourcesLanguageAttribute("")>

View File

@@ -791,25 +791,6 @@ Public Class frmAdministration
Case 7 : value = "$Usercode" Case 7 : value = "$Usercode"
End Select End Select
'Select Case lbFileparameter.SelectedItem.ToString.ToUpper
' Case "Dateiname (mit Endung)".ToUpper
' value = "$filename_ext"
' Case "Dateiname (ohne Endung)".ToUpper
' value = "$filename"
' Case "Dateiendung".ToUpper
' value = "$extension"
' Case "Datei Erstelldatum".ToUpper
' value = "$FileCreateDate"
' Case "Datei Erstellt wer".ToUpper
' value = "$FileCreatedWho"
' Case "Aktuelles Datum (DD.MM.YYYY)".ToUpper
' value = "$DateDDMMYYY"
' Case "Username"
' value = "$Username"
' Case "Usercode"
' value = "$Usercode"
'End Select
If value <> "" Then If value <> "" Then
VALUETextBox.Text = value VALUETextBox.Text = value
Save_IndexAuto() Save_IndexAuto()

View File

@@ -1,15 +1,10 @@
Imports System.Windows.Forms Imports System.IO
Imports System.Data.SqlClient
Imports System.IO
Imports System.Text.RegularExpressions Imports System.Text.RegularExpressions
Imports Independentsoft Imports Independentsoft
Imports Oracle.ManagedDataAccess.Client
Imports System.Text Imports System.Text
Imports System.Security.AccessControl Imports System.Security.AccessControl
Imports System.Security.Principal Imports System.Security.Principal
Imports System.DirectoryServices Imports System.DirectoryServices
Imports DevExpress.XtraEditors.Controls
Imports System.ComponentModel
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Public Class frmIndex Public Class frmIndex
@@ -1844,10 +1839,10 @@ Public Class frmIndex
End If End If
Next Next
'TODO: Replace Windream Patterns?
oSqlResult = ClassPatterns.ReplaceControlValues(oSqlResult, pnlIndex) oSqlResult = ClassPatterns.ReplaceControlValues(oSqlResult, pnlIndex)
oSqlResult = ClassPatterns.ReplaceInternalValues(oSqlResult) oSqlResult = ClassPatterns.ReplaceInternalValues(oSqlResult)
oSqlResult = ClassPatterns.ReplaceUserValues(oSqlResult, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_DOKART_ID)
If oSqlResult <> String.Empty Then If oSqlResult <> String.Empty Then
_Logger.Debug("oSqlResult after Replace [" & oSqlResult & "]") _Logger.Debug("oSqlResult after Replace [" & oSqlResult & "]")
End If End If