taylor 2004/09/19 23:09:00
Modified: applications/pam/src/webapp/WEB-INF/view user-details.jsp
applications/pam/src/webapp/WEB-INF jetspeed-portlet.xml
Log:
User Manager: roles and groups
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.5 +89 -6
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-details.jsp
Index: user-details.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-details.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- user-details.jsp 19 Sep 2004 23:54:42 -0000 1.4
+++ user-details.jsp 20 Sep 2004 06:08:59 -0000 1.5
@@ -113,15 +113,98 @@
</c:if>
<%--End of User Attributes tab data--%>
-<%--Beginning Security tab data--%>
+<%--Beginning Security Role tab data--%>
<%--TODO: switch to c:choose --%>
-<c:if test="${selectedTab.id == 'user_security'}">
- <div id="Security">
- </div>
- <h3>SECURITY ATTRIBUTES</h3>
+<c:if test="${selectedTab.id == 'user_role'}">
+ <div id="Role">
+ <portlet:actionURL var="edit_role_link" />
+ <form name="Edit_Role_Form" action="<c:out value="${edit_role_link}"/>">
+ <input type="hidden" name="portlet_action"
value="security_user.edit_role"/>
+ <table>
+ <tr>
+ <th> </th>
+ <th><fmt:message key="security.rolename"/></th>
+ </tr>
+ <c:forEach var="role" items="${roles}">
+ <tr>
+ <td>
+ <input type="checkbox" name="user_role_id"
value="<c:out value="${role.principal.name}"/>"/>
+ </td>
+ <td>
+ <c:out value="${role.principal.name}"/>
+ </td>
+ </tr>
+ </c:forEach>
+ </table>
+ <input type="submit" value="<fmt:message key="security.remove"/>"
onClick="this.form.portlet_action.value = 'security_user.remove_user_role'"/>
+ </form>
+ <form name="Add_Role_Form" action="<c:out value="${edit_role_link}"/>">
+ <input type="hidden" name="portlet_action"
value="security_user.add_user_role"/>
+
+ <table>
+ <tr>
+ <td>
+ <fmt:message key="security.rolename"/>
+ </td>
+ <td>
+ <input type="text" name="role_name" value=""/>
+ </td>
+ </tr>
+ </table>
+ <input type="submit" value="<fmt:message key="security.add"/>"/>
+ </form>
+
+ </div>
</c:if>
-<%--End of Security tab data--%>
+<%--End of Security Role tab data--%>
+
+<%--Beginning Security Group tab data--%>
+<%--TODO: switch to c:choose --%>
+<c:if test="${selectedTab.id == 'user_group'}">
+ <div id="Role">
+ <portlet:actionURL var="edit_group_link" />
+
+ <form name="Edit_Group_Form" action="<c:out value="${edit_group_link}"/>">
+ <input type="hidden" name="portlet_action"
value="security_user.edit_group"/>
+ <table>
+ <tr>
+ <th> </th>
+ <th><fmt:message key="security.groupname"/></th>
+ </tr>
+ <c:forEach var="group" items="${groups}">
+ <tr>
+ <td>
+ <input type="checkbox" name="user_group_id"
value="<c:out value="${group.principal.name}"/>"/>
+ </td>
+ <td>
+ <c:out value="${group.principal.name}"/>
+ </td>
+ </tr>
+ </c:forEach>
+ </table>
+ <input type="submit" value="<fmt:message key="security.remove"/>"
onClick="this.form.portlet_action.value = 'security_user.remove_user_group'"/>
+ </form>
+ <form name="Add_Group_Form" action="<c:out value="${edit_group_link}"/>">
+ <input type="hidden" name="portlet_action"
value="security_user.add_user_group"/>
+
+ <table>
+ <tr>
+ <td>
+ <fmt:message key="security.groupname"/>
+ </td>
+ <td>
+ <input type="text" name="group_name" value=""/>
+ </td>
+ </tr>
+ </table>
+ <input type="submit" value="<fmt:message key="security.add"/>"/>
+ </form>
+
+ </div>
+</c:if>
+<%--End of Security Group tab data--%>
+
<%--Beginning Profile tab data--%>
<%--TODO: switch to c:choose --%>
1.5 +2 -0
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/jetspeed-portlet.xml
Index: jetspeed-portlet.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/jetspeed-portlet.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jetspeed-portlet.xml 16 Sep 2004 21:25:13 -0000 1.4
+++ jetspeed-portlet.xml 20 Sep 2004 06:08:59 -0000 1.5
@@ -33,6 +33,8 @@
<js:service name='PortletRegistryComponent'/>
<js:service name='UserManager'/>
<js:service name='PageManager'/>
+ <js:service name='RoleManager'/>
+ <js:service name='GroupManager'/>
</js:services>
</portlet-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]