diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java index 5c9ddf910..9c98bf7e1 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java @@ -20,10 +20,16 @@ package org.libreccm.ui.admin.usersgroupsroles; import org.libreccm.core.CoreConstants; import org.libreccm.security.AuthorizationRequired; +import org.libreccm.security.Group; +import org.libreccm.security.GroupRepository; import org.libreccm.security.RequiresPrivilege; +import java.util.List; + import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; import javax.mvc.Controller; +import javax.mvc.Models; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -33,14 +39,23 @@ import javax.ws.rs.Path; */ @RequestScoped @Controller -@Path("/users-groups-roles/group") +@Path("/users-groups-roles/groups") public class GroupsController { + + @Inject + private GroupRepository groupRepository; + + @Inject + private Models models; @GET @Path("/") @AuthorizationRequired @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN) public String getGroups() { + final List groups = groupRepository.findAll(); + models.put("groups", groups); + return "org/libreccm/ui/admin/users-groups-roles/groups.xhtml"; } diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml index 10a4150f6..7e73a4427 100644 --- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml +++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml @@ -1,8 +1,9 @@ - +]> + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -21,7 +22,107 @@ -

Groups placeholder

+
+
+ +
+
+ + + + + #{AdminMessages['usersgroupsroles.groups.add']} + +
+
+ + + + + + + + + + + + + + + + +
#{AdminMessages['usersgroupsroles.groups.table.headers.groupname']}#{AdminMessages['usersgroupsroles.groups.table.headers.actions']}
#{group.name} + + + + + + #{AdminMessages['usersgroupsroles.groups.detailslink.label']} + + + + + +
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties index 0a770e0ab..86a7ec310 100644 --- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties +++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties @@ -129,3 +129,12 @@ usersgroupsroles.users.user_details.roles.dialog.close=Cancel usersgroupsroles.users.user_details.groups.dialog.save=Save usergroupsroles.users.user_details.family_name=Family Name usergroupsroles.users.user_details.email_addresses.errors.address_empty=Address can't be empty +usersgroupsroles.groups.table.headers.groupname=Group +usersgroupsroles.groups.table.headers.actions=Actions +usersgroupsroles.groups.detailslink.label=Details +usersgroupsroles.groups.delete.button.label=Delete +usersgroupsroles.groups.delete.confirm.title=Delete group +usersgroupsroles.groups.delete.confirm.cancel=Cancel +usersgroupsroles.groups.delete.confirm.yes=Delete Group +usersgroupsroles.groups.delete.confirm.message=Are you sure to delete group {0}? +usersgroupsroles.groups.add=Add group diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties index 67d616282..427c3f30c 100644 --- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties +++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties @@ -129,3 +129,12 @@ usersgroupsroles.users.user_details.roles.dialog.close=Abbrechen usersgroupsroles.users.user_details.groups.dialog.save=Anwenden usergroupsroles.users.user_details.family_name=Familienname usergroupsroles.users.user_details.email_addresses.errors.address_empty=Die Addresse kann nicht leer sein +usersgroupsroles.groups.table.headers.groupname=Gruppe +usersgroupsroles.groups.table.headers.actions=Aktionen +usersgroupsroles.groups.detailslink.label=Details +usersgroupsroles.groups.delete.button.label=L\u00f6schen +usersgroupsroles.groups.delete.confirm.title=Gruppe l\u00f6schen +usersgroupsroles.groups.delete.confirm.cancel=Abbrechen +usersgroupsroles.groups.delete.confirm.yes=Gruppe l\u00f6schen +usersgroupsroles.groups.delete.confirm.message=Sind Sie sicher, dass Sie die Gruppe {0} l\u00f6schen wollen? +usersgroupsroles.groups.add=Gruppe hinzuf\u00fcgen