From cd34d8c03f880f2bb993f5e44089487da9c2d221 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 11 Jun 2018 15:35:49 +0200 Subject: [PATCH] jj: better admin check, fix installer --- .../DDUserManager/DDUserManager.vbproj | 6 ++++++ DDUserManager/DDUserManager/frmMain.vb | 2 +- DDUserManager/DDUserManager/user.ico | Bin 0 -> 101526 bytes DDUserManager/SetupWix/Product.wxs | 12 ++++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 DDUserManager/DDUserManager/user.ico diff --git a/DDUserManager/DDUserManager/DDUserManager.vbproj b/DDUserManager/DDUserManager/DDUserManager.vbproj index a5785b2..2f4c0b9 100644 --- a/DDUserManager/DDUserManager/DDUserManager.vbproj +++ b/DDUserManager/DDUserManager/DDUserManager.vbproj @@ -47,6 +47,9 @@ On + + user.ico + @@ -213,5 +216,8 @@ + + + \ No newline at end of file diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index 6c9ffdb..97a3a33 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -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 diff --git a/DDUserManager/DDUserManager/user.ico b/DDUserManager/DDUserManager/user.ico new file mode 100644 index 0000000000000000000000000000000000000000..cb2e328a1acab792d24e360d2e7dd0305ba905f9 GIT binary patch literal 101526 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 X`2G)uw=Vb?z*i+3+c|y(7pDIKaWpJE literal 0 HcmV?d00001 diff --git a/DDUserManager/SetupWix/Product.wxs b/DDUserManager/SetupWix/Product.wxs index 0a17468..8c6a39a 100644 --- a/DDUserManager/SetupWix/Product.wxs +++ b/DDUserManager/SetupWix/Product.wxs @@ -92,6 +92,17 @@ + + + + + + + + + + +