jj: better admin check, fix installer

This commit is contained in:
Jonathan Jenne
2018-06-11 15:35:49 +02:00
parent e01eeeba32
commit cd34d8c03f
4 changed files with 19 additions and 1 deletions

View File

@@ -47,6 +47,9 @@
<PropertyGroup>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>user.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Data.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Printing.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -213,5 +216,8 @@
<ItemGroup>
<None Include="Resources\arrow_refresh.png" />
</ItemGroup>
<ItemGroup>
<Content Include="user.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
</Project>

View File

@@ -12,7 +12,7 @@ Public Class frmMain
Private DragDropManager As ClassDragDrop = Nothing
Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load
If TBDD_USERTableAdapter.IsUserManagerAdmin(Environment.UserName) Then
If TBDD_USERTableAdapter.IsUserManagerAdmin(Environment.UserName) > 0 Then
Dim userRow As TBDD_USERRow = GetCurrentUserRow(Environment.UserName)
tsLabelUser.Text = $"Angemeldeter Benutzer: {userRow.USERNAME}"
CurrentUser = userRow

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB