Changeset 7876

Timestamp:

05/23/12 16:17:12 (12 years ago)

Author:

ascheibe

Message:

#1648 implemented assigning of roles to users

Location:

branches/ClientUserManagement

Files:

• HeuristicLab.Clients.Access.Administration/3.3/HeuristicLab.Clients.Access.Administration-3.3.csproj (modified) (1 diff)
• HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableRoleSelectionListView.Designer.cs (added)
• HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableRoleSelectionListView.cs (added)
• HeuristicLab.Clients.Access.Administration/3.3/Views/RoleSelectionListView.Designer.cs (added)
• HeuristicLab.Clients.Access.Administration/3.3/Views/RoleSelectionListView.cs (added)
• HeuristicLab.Clients.Access.Administration/3.3/Views/UserView.Designer.cs (modified) (10 diffs)
• HeuristicLab.Clients.Access.Administration/3.3/Views/UserView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Access/3.3/ServiceClients/Role.cs (modified) (1 diff)

branches/ClientUserManagement/HeuristicLab.Clients.Access.Administration/3.3/HeuristicLab.Clients.Access.Administration-3.3.csproj

@@ -129 +129 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Views\RefreshableRoleSelectionListView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\RefreshableRoleSelectionListView.Designer.cs">
+      <DependentUpon>RefreshableRoleSelectionListView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\RoleSelectionListView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\RoleSelectionListView.Designer.cs">
+      <DependentUpon>RoleSelectionListView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\RefreshableRoleListView.cs">
       <SubType>UserControl</SubType>

branches/ClientUserManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/UserView.Designer.cs

@@ -37 +37 @@
       this.lastLoginTextBox = new System.Windows.Forms.TextBox();
       this.resetPasswordButton = new System.Windows.Forms.Button();
+      this.refreshableRoleSelectionListView = new HeuristicLab.Clients.Access.Administration.RefreshableRoleSelectionListView();
       this.SuspendLayout();
       // 
@@ -64 +65 @@
       this.userNameTextBox.Location = new System.Drawing.Point(76, 3);
       this.userNameTextBox.Name = "userNameTextBox";
-      this.userNameTextBox.Size = new System.Drawing.Size(285, 20);
+      this.userNameTextBox.Size = new System.Drawing.Size(746, 20);
       this.userNameTextBox.TabIndex = 2;
       this.userNameTextBox.TextChanged += new System.EventHandler(this.userNameTextBox_TextChanged);
@@ -74 +75 @@
       this.fullNameTextBox.Location = new System.Drawing.Point(76, 29);
       this.fullNameTextBox.Name = "fullNameTextBox";
-      this.fullNameTextBox.Size = new System.Drawing.Size(285, 20);
+      this.fullNameTextBox.Size = new System.Drawing.Size(746, 20);
       this.fullNameTextBox.TabIndex = 3;
       this.fullNameTextBox.TextChanged += new System.EventHandler(this.fullNameTextBox_TextChanged);
@@ -102 +103 @@
       this.emailTextBox.Location = new System.Drawing.Point(76, 55);
       this.emailTextBox.Name = "emailTextBox";
-      this.emailTextBox.Size = new System.Drawing.Size(285, 20);
+      this.emailTextBox.Size = new System.Drawing.Size(746, 20);
       this.emailTextBox.TabIndex = 6;
       this.emailTextBox.TextChanged += new System.EventHandler(this.emailTextBox_TextChanged);
@@ -113 +114 @@
       this.idTextBox.Location = new System.Drawing.Point(76, 81);
       this.idTextBox.Name = "idTextBox";
-      this.idTextBox.Size = new System.Drawing.Size(285, 20);
+      this.idTextBox.Size = new System.Drawing.Size(746, 20);
       this.idTextBox.TabIndex = 7;
       // 
@@ -141 +142 @@
       this.lastActivityTextBox.Location = new System.Drawing.Point(76, 107);
       this.lastActivityTextBox.Name = "lastActivityTextBox";
-      this.lastActivityTextBox.Size = new System.Drawing.Size(285, 20);
+      this.lastActivityTextBox.Size = new System.Drawing.Size(746, 20);
       this.lastActivityTextBox.TabIndex = 10;
       // 
@@ -151 +152 @@
       this.lastLoginTextBox.Location = new System.Drawing.Point(76, 133);
       this.lastLoginTextBox.Name = "lastLoginTextBox";
-      this.lastLoginTextBox.Size = new System.Drawing.Size(285, 20);
+      this.lastLoginTextBox.Size = new System.Drawing.Size(746, 20);
       this.lastLoginTextBox.TabIndex = 11;
       // 
       // resetPasswordButton
       // 
-      this.resetPasswordButton.Location = new System.Drawing.Point(6, 159);
+      this.resetPasswordButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.resetPasswordButton.Location = new System.Drawing.Point(8, 417);
       this.resetPasswordButton.Name = "resetPasswordButton";
       this.resetPasswordButton.Size = new System.Drawing.Size(96, 23);
@@ -164 +166 @@
       this.resetPasswordButton.Click += new System.EventHandler(this.resetPasswordButton_Click);
       // 
+      // refreshableRoleSelectionListView
+      // 
+      this.refreshableRoleSelectionListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.refreshableRoleSelectionListView.Caption = "View";
+      this.refreshableRoleSelectionListView.Content = null;
+      this.refreshableRoleSelectionListView.CurrentUser = null;
+      this.refreshableRoleSelectionListView.Location = new System.Drawing.Point(8, 159);
+      this.refreshableRoleSelectionListView.Name = "refreshableRoleSelectionListView";
+      this.refreshableRoleSelectionListView.ReadOnly = false;
+      this.refreshableRoleSelectionListView.Size = new System.Drawing.Size(814, 252);
+      this.refreshableRoleSelectionListView.TabIndex = 13;
+      // 
       // UserView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.refreshableRoleSelectionListView);
       this.Controls.Add(this.resetPasswordButton);
       this.Controls.Add(this.lastLoginTextBox);
@@ -182 +199 @@
       this.Controls.Add(this.label1);
       this.Name = "UserView";
-      this.Size = new System.Drawing.Size(364, 185);
+      this.Size = new System.Drawing.Size(825, 447);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -203 +220 @@
     private System.Windows.Forms.TextBox lastLoginTextBox;
     private System.Windows.Forms.Button resetPasswordButton;
+    private RefreshableRoleSelectionListView refreshableRoleSelectionListView;
   }
 }

branches/ClientUserManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/UserView.cs

@@ -48 +48 @@
         lastActivityTextBox.Clear();
         lastLoginTextBox.Clear();
+        refreshableRoleSelectionListView.Content = null;
+        refreshableRoleSelectionListView.CurrentUser = null;
       } else {
         userNameTextBox.Text = Content.UserName;
@@ -55 +57 @@
         lastActivityTextBox.Text = Content.LastActivityDate.ToString();
         lastLoginTextBox.Text = Content.LastLoginDate.ToString();
+        refreshableRoleSelectionListView.Content = AccessAdministrationClient.Instance;
+        refreshableRoleSelectionListView.CurrentUser = Content;
       }
     }

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ServiceClients/Role.cs

@@ -44 +44 @@
       return Name;
     }
+
+    public override bool Equals(object obj) {
+      return ((Role)obj).Name.Equals(this.Name);
+    }
+
   }
 }