From 00e9cd19665272e3b28570bde53165a51a6f5050 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 12 Jun 2018 14:32:33 +0200 Subject: [PATCH] jj: fix connection string bugs --- DDUserManager/DDUserManager/frmADImport_Groups.vb | 8 +++----- DDUserManager/DDUserManager/frmADImport_Users.vb | 2 ++ DDUserManager/DDUserManager/frmMain.vb | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/DDUserManager/DDUserManager/frmADImport_Groups.vb b/DDUserManager/DDUserManager/frmADImport_Groups.vb index e8c807c..a3cf639 100644 --- a/DDUserManager/DDUserManager/frmADImport_Groups.vb +++ b/DDUserManager/DDUserManager/frmADImport_Groups.vb @@ -3,13 +3,11 @@ Imports DevExpress.XtraGrid.Views.Grid Public Class frmADImport_Groups Private Sub frmADImport_Groups_Load(sender As Object, e As EventArgs) Handles MyBase.Load - 'TODO: Diese Codezeile lädt Daten in die Tabelle "UserDataSet.TBDD_GROUPS". Sie können sie bei Bedarf verschieben oder entfernen. - Me.TBDD_GROUPSTableAdapter.Fill(Me.UserDataSet.TBDD_GROUPS) - 'TODO: Diese Codezeile lädt Daten in die Tabelle "UserDataSet.TBDD_GROUPS". Sie können sie bei Bedarf verschieben oder entfernen. - Me.TBDD_GROUPSTableAdapter.Fill(Me.UserDataSet.TBDD_GROUPS) Try - Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(Environment.UserName) + TBDD_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString + TBDD_GROUPSTableAdapter.Fill(Me.UserDataSet.TBDD_GROUPS) + Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(Environment.UserName) UserDataSet.TBLOCAL_ADGROUPS.Clear() diff --git a/DDUserManager/DDUserManager/frmADImport_Users.vb b/DDUserManager/DDUserManager/frmADImport_Users.vb index fbcc49f..a689bbb 100644 --- a/DDUserManager/DDUserManager/frmADImport_Users.vb +++ b/DDUserManager/DDUserManager/frmADImport_Users.vb @@ -7,6 +7,8 @@ Public Class frmADImport_Users Private Sub frmADImport_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try + TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString + Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(Environment.UserName) gridAD_Groups.DataSource = groups diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index d9fcfdc..90de5b3 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -23,6 +23,7 @@ Public Class frmMain TBDD_GROUPS_USERTableAdapter.Connection.ConnectionString = MyConnectionString TBDD_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString + TBDD_USER_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString If TBDD_USERTableAdapter.IsUserManagerAdmin(Environment.UserName) = 1 Then Dim userRow As TBDD_USERRow = GetCurrentUserRow(Environment.UserName)