Changeset 3800

Timestamp:

Aug 31, 2010, 8:01:47 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed getViewUserRolesForm() method from FormFactory? and introduced UserRolesForm?.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/user/SaveUserRoles.java (modified) (1 diff)
• action/user/ViewActiveUser.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (1 diff)
• gui/form/UserRolesForm.java (added)

trunk/client/servlet/src/org/proteios/action/user/SaveUserRoles.java

@@ -47 +47 @@
   {
     DbControl dc = newDbControl();
-    Form form = getFormFactory().getViewUserRolesForm(dc, null);
+    Form form = new UserRolesForm(dc);
     verifyParameters(form);
     ArrayList<Integer> roleIds = getValidIntegerList(RoleCheckbox.VPARAM);

trunk/client/servlet/src/org/proteios/action/user/ViewActiveUser.java

@@ -90 +90 @@
 
     passwordF = getFormFactory().getViewUserPasswordForm(user);
-    rolesF = getFormFactory().getViewUserRolesForm(dc, user);
+    rolesF = new UserRolesForm(user);
     groupsF = new GroupsForm(user);
     propertiesF = getFormFactory().getViewUserPropertiesForm(user);

trunk/client/servlet/src/org/proteios/gui/form/FormFactory.java

@@ -930 +930 @@
 
  // Cleaning up from here
-
-  public Form getViewUserRolesForm(DbControl dc, User user)
-  {
-    Form form = new Form("userRolesForm");
-    // Roles
-    Fieldset roles = new Fieldset();
-    // user id
-    TextField<Integer> userIdF = newHiddenItemIdField();
-    roles.add(userIdF);
-    if (user != null)
-      userIdF.setValue(user.getId());
-    roles.getLegendTitle().setTitle("Roles");
-    ItemQuery<Role> query = Role.getQuery();
-    for (Role r : query.list(dc))
-    {
-      Checkbox<VInteger> cb = new RoleCheckbox();
-      cb.setValue("" + r.getId());
-      cb.setLabel(r.getName());
-      roles.add(cb);
-      if (user != null)
-      {
-        if (r.isMember(user))
-          cb.isChecked(true);
-      }
-    }
-    form.addFieldset(roles);
-    return form;
-  }
-
 
   public Form getViewUserPropertiesForm(User user)