Merge branch 'master' of http://git.dd:3000/AppStd/Modules
This commit is contained in:
commit
f3b370c26f
@ -148,7 +148,17 @@ Public Class MSSQLServer
|
|||||||
Public Function GetConnectionStringForId(pConnectionId As Integer) As String
|
Public Function GetConnectionStringForId(pConnectionId As Integer) As String
|
||||||
Return Get_ConnectionStringforID(pConnectionId)
|
Return Get_ConnectionStringforID(pConnectionId)
|
||||||
End Function
|
End Function
|
||||||
|
Public Function GetGDPictureString() As String
|
||||||
|
Using oConnection As SqlConnection = GetSQLConnection()
|
||||||
|
Dim oSQL = Queries.DD_ECM.ThirdPartyModules.GdPictureLicense
|
||||||
|
Dim oGDPicture = GetScalarValueWithConnectionObject(oSQL, oConnection)
|
||||||
|
If oGDPicture = String.Empty Then
|
||||||
|
oSQL = Queries.DD_ECM.ThirdPartyModules.GdPictureLicense_REGULAR
|
||||||
|
oGDPicture = GetScalarValueWithConnectionObject(oSQL, oConnection)
|
||||||
|
End If
|
||||||
|
Return oGDPicture
|
||||||
|
End Using
|
||||||
|
End Function
|
||||||
Public Function Get_ConnectionStringforID(pConnectionId As Integer) As String
|
Public Function Get_ConnectionStringforID(pConnectionId As Integer) As String
|
||||||
Dim oConnectionString As String = String.Empty
|
Dim oConnectionString As String = String.Empty
|
||||||
|
|
||||||
|
|||||||
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("2.3.5.2")>
|
<Assembly: AssemblyVersion("2.3.5.3")>
|
||||||
<Assembly: AssemblyFileVersion("2.3.5.2")>
|
<Assembly: AssemblyFileVersion("2.3.5.3")>
|
||||||
|
|||||||
@ -1,7 +1,8 @@
|
|||||||
Public Class Queries
|
Public Class Queries
|
||||||
Public Class DD_ECM
|
Public Class DD_ECM
|
||||||
Public Class ThirdPartyModules
|
Public Class ThirdPartyModules
|
||||||
Public Const GdPictureLicense As String = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' AND ACTIVE = 1"
|
Public Const GdPictureLicense As String = "SELECT COALESCE(MAX(LICENSE),'') FROM TBDD_3RD_PARTY_MODULES WHERE ACTIVE = 1 AND NAME = 'GDPICTURE' AND [VERSION] = '11.2024'"
|
||||||
|
Public Const GdPictureLicense_REGULAR As String = "SELECT COALESCE(MAX(LICENSE),'') FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' AND ACTIVE = 1"
|
||||||
End Class
|
End Class
|
||||||
|
|
||||||
Public Class Connections
|
Public Class Connections
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user