Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv14781
Modified Files:
userlist_table.jspf
Log Message:
CMSC-949, Blocking users: user status enhancements,show useful state by jsp
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: userlist_table.jspf
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- userlist_table.jspf 2 Dec 2008 08:18:01 -0000 1.7
+++ userlist_table.jspf 2 Dec 2008 08:46:16 -0000 1.8
@@ -34,10 +34,26 @@
</edit:ui-tcolumn>
<edit:ui-tcolumn titlekey="community.search.state">
<select
onchange="selectState('${pageContext.request.contextPath
}/editors/community/SearchConditionalUser.do?page=${page}&sortby=${param.sortby}&dir=${param.dir}&authid=${person.authId}',this)"
>
- <option selected="selected"
value="ACTIVE">${person.active}</option>
- <option value="ACTIVE"><fmt:message
key="community.search.state.active"/> </option>
+ <c:if test="${not empty person.active}">
+ <option selected="selected"
value="${person.active}">${person.active}</option>
+ </c:if>
+ <c:if test="${empty person.active}">
+ <option selected="selected" value="ACTIVE"><fmt:message
key="community.search.state.active"/></option>
+ <option value="UNCONFIRMED"><fmt:message
key="community.search.state.unconfirmed"/> </option>
+ <option value="BLOCKED"><fmt:message
key="community.search.state.blocked"/></option>
+ </c:if>
+ <c:if test="${person.active == 'ACTIVE'}">
<option value="UNCONFIRMED"><fmt:message
key="community.search.state.unconfirmed"/> </option>
<option value="BLOCKED"><fmt:message
key="community.search.state.blocked"/></option>
+ </c:if>
+ <c:if test="${person.active == 'UNCONFIRMED'}">
+ <option value="ACTIVE"><fmt:message
key="community.search.state.active"/> </option>
+ <option value="BLOCKED"><fmt:message
key="community.search.state.blocked"/></option>
+ </c:if>
+ <c:if test="${person.active == 'BLOCKED'}">
+ <option value="ACTIVE"><fmt:message
key="community.search.state.active"/> </option>
+ <option value="UNCONFIRMED"><fmt:message
key="community.search.state.unconfirmed"/> </option>
+ </c:if>
</select>
</edit:ui-tcolumn>
</edit:ui-table>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
