From: <mar...@us...> - 2010-02-19 14:57:45
|
Revision: 34 http://cronoscontrol.svn.sourceforge.net/cronoscontrol/?rev=34&view=rev Author: marioarce Date: 2010-02-19 14:57:16 +0000 (Fri, 19 Feb 2010) Log Message: ----------- * modified to use CronosControlContext.Current.ObjectContext in order to get the shared CronosControlEntities instance ( r33 ) * modified according with the recreated the ADO.NET Entity Data Model changes ( r32 ) Modified Paths: -------------- source/trunk/CronosControl/Libraries/BusinessLogic/ProjectUser/ProjectUserManager.cs Modified: source/trunk/CronosControl/Libraries/BusinessLogic/ProjectUser/ProjectUserManager.cs =================================================================== --- source/trunk/CronosControl/Libraries/BusinessLogic/ProjectUser/ProjectUserManager.cs 2010-02-19 14:50:23 UTC (rev 33) +++ source/trunk/CronosControl/Libraries/BusinessLogic/ProjectUser/ProjectUserManager.cs 2010-02-19 14:57:16 UTC (rev 34) @@ -111,7 +111,8 @@ foreach (var roleName in roleNames) { - CronosControlEntities cronosControlEntities = new CronosControlEntities(); + CronosControlEntities cronosControlEntities = CronosControlContext.Current.ObjectContext; + // get Role Role role = (from r in cronosControlEntities.Role where r.Name.Equals(roleName) @@ -123,7 +124,7 @@ UserProjectRole userProjectRole = new UserProjectRole(); userProjectRole.Role = role; userProjectRole.Project = project; - userProjectRole.IdUser = user.IdUser; + userProjectRole.User = user; cronosControlEntities.AddToUserProjectRole(userProjectRole); cronosControlEntities.SaveChanges(); @@ -206,7 +207,7 @@ return new string[] { }; } - CronosControlEntities cronosControlEntities = new CronosControlEntities(); + CronosControlEntities cronosControlEntities = CronosControlContext.Current.ObjectContext; Project project = CronosControlContext.Current.CurrentProject; @@ -214,7 +215,7 @@ List<string> userProjectRoles = (from upr in cronosControlEntities.UserProjectRole join ro in cronosControlEntities.Role on new { upr.Role.IdRole } equals new { ro.IdRole } - where (upr.IdUser == user.IdUser && upr.Project.IdProject == project.IdProject) + where (upr.User.IdUser == user.IdUser && upr.Project.IdProject == 2/*project.IdProject*/) select ro.Name).ToList<string>(); string[] result = new string[userProjectRoles.Count]; @@ -237,7 +238,7 @@ if (!CommonHelper.IsValidEmail(email)) return null; - CronosControlEntities cronosControlEntities = new CronosControlEntities(); + CronosControlEntities cronosControlEntities = CronosControlContext.Current.ObjectContext; User user = (from u in cronosControlEntities.User where u.Email.Equals(email) select u).First<User>(); @@ -255,7 +256,7 @@ if (projectUserID == 0) return null; - CronosControlEntities cronosControlEntities = new CronosControlEntities(); + CronosControlEntities cronosControlEntities = CronosControlContext.Current.ObjectContext; User user = (from u in cronosControlEntities.User where u.IdUser.Equals(projectUserID) select u).First<User>(); @@ -274,7 +275,7 @@ return null; User user; - CronosControlEntities cronosControlEntities = new CronosControlEntities(); + CronosControlEntities cronosControlEntities = CronosControlContext.Current.ObjectContext; try { user = (from u in cronosControlEntities.User @@ -304,9 +305,9 @@ User user = GetProjectUserByUsername(username); - CronosControlEntities cronosControlEntities = new CronosControlEntities(); + CronosControlEntities cronosControlEntities = CronosControlContext.Current.ObjectContext; int result = (from upr in cronosControlEntities.UserProjectRole - where (upr.IdUser == 1 && upr.Role.Name.Equals(roleName)) + where (upr.User.IdUser == user.IdUser && upr.Role.Name.Equals(roleName)) select upr).Count<UserProjectRole>(); return (result == 1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |