Changeset 7380

Timestamp:

01/20/12 13:24:10 (13 years ago)

Author:

ascheibe

Message:

#1648

• fixed user query ws methods
• improved user view

Location:

branches/ClientUserManagement

Files:

• HeuristicLab.Clients.Access/3.3/AccessClient.cs (modified) (1 diff)
• HeuristicLab.Clients.Access/3.3/Views/LightweightUserView.cs (modified) (1 diff)
• HeuristicLab.Clients.Access/3.3/Views/RefreshableLightweightUserView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Access/3.3/Views/RefreshableView.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/AccessService.cs (modified) (5 diffs)

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/AccessClient.cs

@@ -93 +93 @@
 
     public static void Store(IAccessItem item) {
-      //TODO: never used? delete?
+      //TODO: prevent storing of lightweight users
     }
 

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/Views/LightweightUserView.cs

@@ -31 +31 @@
 
   [View("LightweightUser View")]
-  [Content(typeof(CheckedItemList<LightweightUser>), true)]
+  [Content(typeof(ReadOnlyCheckedItemList<LightweightUser>), true)]
   public partial class LightweightUserView : CheckedItemListView<LightweightUser> {
     public LightweightUserView() {
       InitializeComponent();
       this.showDetailsCheckBox.Checked = false;
+      this.itemsGroupBox.Text = "Users";
     }
 
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      this.addButton.Enabled = false;
       this.showDetailsCheckBox.Enabled = false;
-      this.removeButton.Enabled = false;
-    }
-
-    protected override void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
-      base.itemsListView_SelectedIndexChanged(sender, e);
-      this.removeButton.Enabled = false;
     }
 

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/Views/RefreshableLightweightUserView.cs

@@ -34 +34 @@
     public RefreshableLightweightUserView() {
       InitializeComponent();
-
     }
 
-    //set an action like a webservice call to retrieve the users which should be marked as checked       
-    //TODO: disable refresh button if not set
+    //set an action like a webservice call to retrieve the users which should be marked as checked           
     public Func<List<Guid>> FetchSelectedUsers { get; set; }
     private List<Guid> selectedUsers;
@@ -64 +62 @@
         checkedUsers.SetItemCheckedState(idx, selectedUsers.Contains(u.Id));
       });
-      lightweightUserView.Content = checkedUsers;
+      lightweightUserView.Content = checkedUsers.AsReadOnly();
+    }
+
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      refreshButton.Enabled = FetchSelectedUsers != null;
     }
 
     public ICheckedItemList<LightweightUser> GetCheckedUsers() {
-      if (lightweightUserView.Content == null)
-        return null;
-      else
-        return lightweightUserView.Content;
+      return (lightweightUserView.Content == null) ? null : lightweightUserView.Content;
     }
 

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/Views/RefreshableView.cs

@@ -49 +49 @@
     }
 
-
-    protected override void OnContentChanged() {
-      base.OnContentChanged();
-      if (Content == null) {
-        //TODO: remove?
-      } else {
-
-      }
-    }
-
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/AccessService.cs

@@ -278 +278 @@
       DA.User accessUser = null;
 
-      using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
-        var query = from u in context.UserGroupBases.OfType<DA.User>()
-                    where u.Id == userId
-                    select u;
-        if (query.Count() == 1) {
-          accessUser = query.First();
-        } else {
-          //if the user is not in the access db at it
-          DA.User user = new DA.User();
-          user.Id = userId;
-          user.FullName = "Not set";
-          context.UserGroupBases.InsertOnSubmit(user);
-          context.SubmitChanges();
-          accessUser = user;
-        }
-      }
-
       using (DA.ASPNETAuthenticationDataContext context = new DA.ASPNETAuthenticationDataContext()) {
         var userQuery = from u in context.aspnet_Users
@@ -311 +294 @@
       }
 
+      if (aspUser == null || aspMembership == null) {
+        using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
+          var query = from u in context.UserGroupBases.OfType<DA.User>()
+                      where u.Id == userId
+                      select u;
+          if (query.Count() == 1) {
+            accessUser = query.First();
+          } else {
+            //if the user is not in the access db add it (this makes it easy to upgrade with an existing asp.net authentication db)
+            DA.User user = new DA.User();
+            user.Id = userId;
+            user.FullName = "Not set";
+            context.UserGroupBases.InsertOnSubmit(user);
+            context.SubmitChanges();
+            accessUser = user;
+          }
+        }
+      }
+
       if (aspUser == null || aspMembership == null || accessUser == null) {
-        //TODO: error handling
-        return null;
+        throw new Exception("User with id " + userId + " not found.");
       } else {
         return Convert.ToDto(accessUser, aspUser, aspMembership);
@@ -332 +333 @@
       }
 
-      using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
-        var query = from u in context.UserGroupBases.OfType<DA.User>()
-                    where u.Id == userId
-                    select u;
-        if (query.Count() == 1) {
-          accessUser = query.First();
-        } else {
-          //if the user is not in the access db at it
-          DA.User user = new DA.User();
-          user.Id = userId;
-          user.FullName = "Not set";
-          context.UserGroupBases.InsertOnSubmit(user);
-          context.SubmitChanges();
-          accessUser = user;
+      if (aspUser != null) {
+        using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
+          var query = from u in context.UserGroupBases.OfType<DA.User>()
+                      where u.Id == userId
+                      select u;
+          if (query.Count() == 1) {
+            accessUser = query.First();
+          } else {
+            //if the user is not in the access db add it (this makes it easy to upgrade with an existing asp.net authentication db)
+            DA.User user = new DA.User();
+            user.Id = userId;
+            user.FullName = "Not set";
+            context.UserGroupBases.InsertOnSubmit(user);
+            context.SubmitChanges();
+            accessUser = user;
+          }
         }
       }
 
       if (aspUser == null || accessUser == null) {
-        //TODO: error handling
-        return null;
+        throw new Exception("User with id " + userId + " not found.");
       } else {
         return Convert.ToDto(accessUser, aspUser);
@@ -365 +367 @@
       List<Guid> accessUserGuids = null;
 
-      using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
-        var query = from u in context.UserGroupBases.OfType<DA.User>()
-                    select u.Id;
+      using (DA.ASPNETAuthenticationDataContext context = new DA.ASPNETAuthenticationDataContext()) {
+        var query = from u in context.aspnet_Users
+                    select u.UserId;
         accessUserGuids = query.ToList();
       }
-
       return accessUserGuids.Select(x => BuildLightweightUserDto(x));
     }
@@ -377 +378 @@
       List<Guid> accessUserGuids = null;
 
-      using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
-        var query = from u in context.UserGroupBases.OfType<DA.User>()
-                    select u.Id;
+      using (DA.ASPNETAuthenticationDataContext context = new DA.ASPNETAuthenticationDataContext()) {
+        var query = from u in context.aspnet_Users
+                    select u.UserId;
         accessUserGuids = query.ToList();
       }