Context Navigation

Changeset 12932 for trunk/sources

Timestamp:

09/02/15 14:28:46 (9 years ago)

Author:

ascheibe

Message:

#2388 fixed problem with not existing users when downloading shared jobs

Location:

trunk/sources

Files:

r12012	r12932
30	30	MembershipUser GetUserByName(string username);
31	31	MembershipUser GetUserById(Guid userId);
	32	string GetUserNameById(Guid userId);
32	33	bool VerifyUser(Guid userId, List<Guid> allowedUserGroups);
33	34	}

-                      r12012
+                      r12932
     public MembershipUser GetUserById(Guid userId) {
       return Membership.GetUser(userId);
+    }
+    public string GetUserNameById(Guid userId) {
+      var user = GetUserById(userId);
+      if (user != null) {
+        return user.UserName;
+      } else {
+        return userId.ToString();
+      }
+    }

-                      r12926
+                      r12932
               job.FinishedCount = statistics.FinishedCount;
+            }
             job.OwnerUsername = UserManager.GetUserById(job.OwnerUserId).UserName;
+            job.OwnerUsername = UserManager.GetUserNameById(job.OwnerUserId);
             if (currentUserId == job.OwnerUserId) {
               job.Permission = Permission.Full;
 …
               job.FinishedCount = statistic.FinishedCount;
+            }
             job.OwnerUsername = UserManager.GetUserById(job.OwnerUserId).UserName;
+            job.OwnerUsername = UserManager.GetUserNameById(job.OwnerUserId);
             if (currentUserId == job.OwnerUserId) {
               job.Permission = Permission.Full;

r12913	r12932
62	62	User = new DT.User {
63	63	Id = uts.UserId.ToString(),
64		Name = ServiceLocator.Instance.UserManager.GetUser~~ById(uts.UserId).UserName~~
	64	Name = ServiceLocator.Instance.UserManager.GetUserNameById(uts.UserId)
65	65	},
66	66	CalculatingTasks = uts.CalculatingTasks,

Note: See TracChangeset for help on using the changeset viewer.