Changeset 5812 for ComponentRegistry

Timestamp:

11/13/14 08:58:23 (10 years ago)

Author:

Twan Goosen

Message:

further improvements on the groups admin page
refs #691

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend

Files:

• Groups.html (modified) (1 diff)
• Groups.java (modified) (4 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/Groups.html

@@ -45 +45 @@
                 <li wicket:id="members">
                     <span wicket:id="name">[name]</span>
-                    <a wicket:id="remove">[Remove]</a>
+                </li>
+            </ul>
+            
+            <hr />
+            
+            <h4>Items in group</h4>
+            <ul>
+                <li wicket:id="items">
+                    <a wicket:id="link"><span wicket:id="id">[name]</span></a>
                 </li>
             </ul>

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/Groups.java

@@ -2 +2 @@
 
 import clarin.cmdi.componentregistry.ItemNotFoundException;
+import clarin.cmdi.componentregistry.impl.ComponentUtils;
 import clarin.cmdi.componentregistry.impl.database.GroupService;
 import clarin.cmdi.componentregistry.impl.database.ValidationException;
 import clarin.cmdi.componentregistry.model.RegistryUser;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.List;
@@ -13 +16 @@
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.link.ExternalLink;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.list.ListItem;
@@ -119 +123 @@
         container.add(createNewMemberForm("newMember"));
         container.add(createGroupMembersView("members"));
+        container.add(createItemsView("items"));
 
         return container;
@@ -163 +168 @@
                 final RegistryUser user = (RegistryUser) li.getModelObject();
                 li.add(new Label("name", user.getName()));
-                li.add(new Link("remove") {
+//                li.add(new Link("remove") {
+//
+//                    @Override
+//                    public void onClick() {
+//                        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+//                    }
+//                });
+            }
+        };
+        return membersView;
+    }
+
+    private ListView createItemsView(String id) {
+        final IModel<List> itemsModel = new AbstractReadOnlyModel<List>() {
+
+            @Override
+            public List getObject() {
+                final Long groupId = selectedGroup.getObject();
+                return Lists.newArrayList(Iterables.concat(
+                        groupService.getComponentIdsInGroup(groupId),
+                        groupService.getProfileIdsInGroup(groupId)));
+            }
+        };
+        final ListView itemsView = new ListView(id, itemsModel) {
+
+            @Override
+            protected void populateItem(ListItem li) {
+                final String id = (String) li.getModelObject();
+                final ExternalLink link = new ExternalLink("link", new AbstractReadOnlyModel<String>() {
 
                     @Override
-                    public void onClick() {
-                        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+                    public String getObject() {
+                        if (ComponentUtils.isProfileId(id)) {
+                            return "../rest/registry/profiles/" + id;
+                        } else {
+                            return "../rest/registry/components/" + id;
+                        }
                     }
                 });
-            }
-        };
-        return membersView;
+                link.add(new Label("id", li.getModel()));
+                li.add(link);
+            }
+        };
+        return itemsView;
     }