AppStd/UserManager
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jj version 1.0.0.3: fix groups assigned users display

Browse Source
This commit is contained in:
Jonathan Jenne 2018-10-04 12:15:09 +02:00
parent a57cc616c6
commit 954902b126
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DDUserManager/DDUserManager/My Project/AssemblyInfo.vb
View File

@ -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("1.0.0.2")> <Assembly: AssemblyVersion("1.0.0.3")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

15
DDUserManager/DDUserManager/frmMain.vb
View File

@ -3,6 +3,7 @@ Imports DevExpress.XtraGrid.Views.Grid
Imports DDUserManager.UserDataSet Imports DDUserManager.UserDataSet
Imports DDUserManager.DS_ChangeS Imports DDUserManager.DS_ChangeS
Imports DD_LIB_Standards Imports DD_LIB_Standards
Imports System.Reflection
''' <summary> ''' <summary>
''' Anmerkungen: ''' Anmerkungen:
@ -14,6 +15,7 @@ Public Class frmMain
Private CurrentUser As TBDD_USERRow = Nothing Private CurrentUser As TBDD_USERRow = Nothing
Private CurrentUserId As Integer Private CurrentUserId As Integer
Private CurrentVersion As String
Private DragDropManager As ClassDragDrop = Nothing Private DragDropManager As ClassDragDrop = Nothing
@ -22,8 +24,10 @@ Public Class frmMain
Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Try Try
NLog.LogManager.Configuration = ClassNLog.GetLoggerConfigFor(MODULE_NAME) NLog.LogManager.Configuration = ClassNLog.GetLoggerConfigFor(MODULE_NAME)
CurrentVersion = Assembly.GetEntryAssembly().GetName().Version.ToString()
logger.Info("Starting UserManager v" & Application.ProductVersion)
logger.Info("Starting UserManager v" & CurrentVersion)
logger.Info($"Current Username: {Environment.UserName}") logger.Info($"Current Username: {Environment.UserName}")
If InitDatabase() = False Then If InitDatabase() = False Then
@ -75,7 +79,7 @@ Public Class frmMain
End If End If
tsLabelUser.Text = $"Angemeldeter Benutzer: {Environment.UserName}" tsLabelUser.Text = $"Angemeldeter Benutzer: {Environment.UserName}"
tsLabelVersion.Text = $"Version {Application.ProductVersion}" tsLabelVersion.Text = $"Version {CurrentVersion}"
lblADRootNode.Text = String.Format(lblADRootNode.Text, Environment.UserDomainName) lblADRootNode.Text = String.Format(lblADRootNode.Text, Environment.UserDomainName)
txtADRootNode.Text = ActiveDirectoryRootNode txtADRootNode.Text = ActiveDirectoryRootNode
@ -393,11 +397,8 @@ Public Class frmMain
Private Function GetAssignedUsersByGroupId(groupId As Integer) As TBDD_USERDataTable Private Function GetAssignedUsersByGroupId(groupId As Integer) As TBDD_USERDataTable
Try Try
Dim dt As New TBDD_USERDataTable() Dim dt As New TBDD_USERDataTable()
Dim sql = String.Format("SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, T1.LANGUAGE, T1.COMMENT, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN " & TBDD_USERTableAdapter.FillByGroupId(dt, groupId)
"FROM TBDD_USER AS T1 INNER JOIN " &
" TBDD_GROUPS_USER AS T2 ON T1.GUID = T2.USER_ID " &
"WHERE (T2.GROUP_ID = {0})", groupId)
clsDatabase.Return_Datatable(sql)
Return dt Return dt
Catch ex As Exception Catch ex As Exception
ShowErrorMessage($"Error in GetAssignedUsersByGroupId with groupId {groupId}", ex) ShowErrorMessage($"Error in GetAssignedUsersByGroupId with groupId {groupId}", ex)