Ms merge
This commit is contained in:
@@ -323,7 +323,7 @@ Public Class frmMassValidator
|
||||
lookup.Properties.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM")
|
||||
lookup.Properties.MultiSelect = oMultiselect
|
||||
|
||||
If NotNull(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
|
||||
If ClassAllgemeineFunktionen.NotNullString(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
|
||||
lookup.Properties.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")}
|
||||
End If
|
||||
|
||||
@@ -449,7 +449,7 @@ Public Class frmMassValidator
|
||||
End If
|
||||
Dim idxname As String = controlRow.Item("INDEX_NAME")
|
||||
' Wenn kein defaultValue existiert, leeren String setzen
|
||||
Dim defaultValue As String = NotNull(controlRow.Item("DEFAULT_VALUE"), String.Empty)
|
||||
Dim defaultValue As String = ClassAllgemeineFunktionen.NotNullString(controlRow.Item("DEFAULT_VALUE"), String.Empty)
|
||||
indexname = idxname
|
||||
Dim LoadIDX As Boolean = controlRow.Item("LOAD_IDX_VALUE")
|
||||
LOGGER.Debug("INDEX: " & idxname & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & LoadIDX.ToString)
|
||||
@@ -474,7 +474,7 @@ Public Class frmMassValidator
|
||||
If wertWD = "" And defaultValue <> "" Then
|
||||
oControl.Text = defaultValue
|
||||
Else
|
||||
oControl.Text = NotNull(wertWD, defaultValue)
|
||||
oControl.Text = ClassAllgemeineFunktionen.NotNullString(wertWD, defaultValue)
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user