Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator
This commit is contained in:
commit
de2cc62f95
@ -243,7 +243,7 @@ Partial Public Class frmFieldEditor
|
|||||||
If oElement IsNot Nothing Then
|
If oElement IsNot Nothing Then
|
||||||
oStickyNote.Tag = GetAnnotationTag(SelectedReceiver.Id, oPage, oElement.Id)
|
oStickyNote.Tag = GetAnnotationTag(SelectedReceiver.Id, oPage, oElement.Id)
|
||||||
Else
|
Else
|
||||||
MsgBox("No Element for Update found!")
|
'MsgBox("No Element for Update found!")
|
||||||
Logger.Error("No Element for Update found!")
|
Logger.Error("No Element for Update found!")
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
|
|||||||
@ -795,9 +795,12 @@ Public Class frmMain
|
|||||||
If oDT.Rows.Count = 1 Then
|
If oDT.Rows.Count = 1 Then
|
||||||
Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE")
|
Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE")
|
||||||
Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY")
|
Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY")
|
||||||
Dim oForm As New frm2Factor_Properties(oReceiver.EmailAddress, oTOTP, oTFA_REG_DL, DB_DD_ECM)
|
If Not IsDBNull(oTOTP) And Not IsDBNull(oTFA_REG_DL) Then
|
||||||
|
Dim oForm As New frm2Factor_Properties(oReceiver.EmailAddress, oTOTP.ToString, oTFA_REG_DL, DB_DD_ECM)
|
||||||
oForm.ShowDialog()
|
oForm.ShowDialog()
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Else
|
Else
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user