Changeset 3799

Timestamp:

Aug 30, 2010, 2:18:25 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed getGroupsForm() method from FormFactory?. Also introduced GroupsForm? and GroupCheckbox? field.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/user/ViewActiveUser.java (modified) (2 diffs)
• gui/form/FormFactory.java (modified) (1 diff)
• gui/form/GroupCheckbox.java (added)
• gui/form/GroupsForm.java (added)

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

@@ -37 +37 @@
 import org.proteios.gui.RowContainer;
 import org.proteios.gui.ColumnContainer;
-import org.proteios.gui.form.Form;
+import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
 import se.lu.thep.waf.ActionException;
@@ -91 +91 @@
     passwordF = getFormFactory().getViewUserPasswordForm(user);
     rolesF = getFormFactory().getViewUserRolesForm(dc, user);
-    groupsF = getFormFactory().getGroupsForm(dc, user);
+    groupsF = new GroupsForm(user);
     propertiesF = getFormFactory().getViewUserPropertiesForm(user);
   title.setSubtitle(user.getName());

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

@@ -930 +930 @@
 
  // Cleaning up from here
-  public Form getGroupsForm(DbControl dc, User user)
-  {
-    // Define
-    Form form;
-    Fieldset groups;
-    TextField<Integer> userIdF;
-    ItemQuery<Group> query;
-    Checkbox<VInteger> cb;
-    ItemResultIterator<Group> iterator;
-    Group group;
-    // Create
-    form = new Form("groupForm");
-    groups = new Fieldset();
-    userIdF = newHiddenItemIdField();
-    query = Group.getQuery();
-    iterator = query.iterate(dc);
-    // Use
-    groups.add(userIdF);
-    if (user != null)
-      userIdF.setValue(user.getId());
-    groups.getLegendTitle().setTitle("Groups");
-    while (iterator.hasNext())
-    {
-      group = iterator.next();
-      if (!group.isSystemItem())
-      {
-        cb = new Checkbox<VInteger>(VGROUPID);
-        cb.setValue("" + group.getId());
-        cb.setLabel(group.getName());
-        if (user != null)
-        {
-          if (group.isMember(user))
-            cb.isChecked(true);
-        }
-        groups.add(cb);
-      }
-    }
-    form.addFieldset(groups);
-    return form;
-  }
-
 
   public Form getViewUserRolesForm(DbControl dc, User user)