diff --git a/Config/Entities/User.cs b/Config/Entities/User.cs index c92beab73..c1c9ffd7d 100644 --- a/Config/Entities/User.cs +++ b/Config/Entities/User.cs @@ -23,38 +23,33 @@ namespace Config.Entities public virtual DateTime LastPwChange { get; set; } public virtual IList Groups { get; set; } //User can be a member of a list of groups - private bool powerUser; /// Set to tue for built-in users, power users have full access even with empty Groups + private bool powerUser; /// true for built-in users, power users have full access even with empty Groups list public User() { this.powerUser = false; Groups = new List(); +#if IPERLST + Number = 6; +#else + Number = 0; +#endif } + public User(string name, int number, bool powerUser) + { + Name = name; + Number = number; + this.powerUser = powerUser; + Groups = new List(); + Description = "Power user"; + } + public virtual void AddGroup(Group group) { Groups.Add(group); } - - public User(string name) - { - this.powerUser = true; - Name = name; - Number = 0; - Groups = new List(); - Description = "Power user"; - } - - public User(string name, int number) - { - this.powerUser = true; - Name = name; - Number = number; - Groups = new List(); - Description = "Power user"; - } - /// ------------- Additional stuff not mapped into the database ------------- /// diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs index 3fcb2a9a3..ebfefa3e0 100644 --- a/TestBenchFramework/Program.cs +++ b/TestBenchFramework/Program.cs @@ -211,7 +211,7 @@ namespace TBF if (User.IsPowerUser(loginDlgBench.User, loginDlgBench.Password)) { - loadedUser = new User(loginDlgBench.User, 6); + loadedUser = new User(loginDlgBench.User, 6, true); authorized = loadedUser.Authorize(loginDlgBench.User, loginDlgBench.Password); } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 4bbc95216..1d6e61793 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.5.261.1")] -[assembly: AssemblyFileVersion("2.5.261.1")] +[assembly: AssemblyVersion("2.5.262.1")] +[assembly: AssemblyFileVersion("2.5.262.1")]