iPerlST bug fix: User number = 6 when a new user is created, ver.2.4.262.

This commit is contained in:
Milan Hanajik
2016-04-11 12:28:40 +02:00
parent e001d01f15
commit fdd4036797
3 changed files with 18 additions and 23 deletions
+15 -20
View File
@@ -23,12 +23,26 @@ namespace Config.Entities
public virtual DateTime LastPwChange { get; set; } public virtual DateTime LastPwChange { get; set; }
public virtual IList<Group> Groups { get; set; } //User can be a member of a list of groups public virtual IList<Group> 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() public User()
{ {
this.powerUser = false; this.powerUser = false;
Groups = new List<Group>(); Groups = new List<Group>();
#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<Group>();
Description = "Power user";
} }
public virtual void AddGroup(Group group) public virtual void AddGroup(Group group)
@@ -36,25 +50,6 @@ namespace Config.Entities
Groups.Add(group); Groups.Add(group);
} }
public User(string name)
{
this.powerUser = true;
Name = name;
Number = 0;
Groups = new List<Group>();
Description = "Power user";
}
public User(string name, int number)
{
this.powerUser = true;
Name = name;
Number = number;
Groups = new List<Group>();
Description = "Power user";
}
/// ------------- Additional stuff not mapped into the database ------------- /// ------------- Additional stuff not mapped into the database -------------
/// ///
+1 -1
View File
@@ -211,7 +211,7 @@ namespace TBF
if (User.IsPowerUser(loginDlgBench.User, loginDlgBench.Password)) 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); authorized = loadedUser.Authorize(loginDlgBench.User, loginDlgBench.Password);
} }
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.5.261.1")] [assembly: AssemblyVersion("2.5.262.1")]
[assembly: AssemblyFileVersion("2.5.261.1")] [assembly: AssemblyFileVersion("2.5.262.1")]