portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/users user-details.jsp
Date Tue, 26 Apr 2005 21:39:56 GMT
ate         2005/04/26 14:39:56

  Modified:    applications/security/src/webapp/WEB-INF/security/users
                        user-details.jsp
  Log:
  Implementation for http://issues.apache.org/jira/browse/JS2-242: Configuration of User Details
Portlet contents and behavior
  (some changes I somehow managed to "lose" and had to recreate again)
  
  Revision  Changes    Path
  1.13      +50 -32    jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/users/user-details.jsp
  
  Index: user-details.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/users/user-details.jsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- user-details.jsp	26 Apr 2005 14:07:04 -0000	1.12
  +++ user-details.jsp	26 Apr 2005 21:39:56 -0000	1.13
  @@ -32,6 +32,7 @@
   <portlet:defineObjects/>
   
   <c:set var="user" value="${requestScope.user}" />
  +<c:set var="prefs" value="${renderRequest.preferences.map}"/>
   
   <%--Beginning of User check --%>
   <c:if test="${user != null}">
  @@ -93,7 +94,7 @@
   			</tr>
       </c:forEach>
   
  -    <c:if test='${renderRequest.preferences.map["showPasswordOnUserTab"][0]}'>
  +    <c:if test='${prefs["showPasswordOnUserTab"][0]}'>
         <c:if test="${canUpdate}">
           <tr><td colspan="5">&nbsp;</td></tr>
         </c:if>
  @@ -572,37 +573,54 @@
       </td>
     </tr>
     
  -  <!-- Select Roles -->
  -  <tr colspan="2" align="right">
  -    <td nowrap class="portlet-section-alternate" align="right">Default Role:&nbsp;</td>
  -    <td class="portlet-section-body" align="left">
  - 		<select name="jetspeedRoles" class="portlet-form-field-label">		
  -			<option value=""/> 		 		
  -			<c:forEach var="roleName" items="${jetspeedRoles}">			    
  -			    <option value="<c:out value='${roleName}'/>"
  -  			    <c:if test="${roleName == 'user'}">selected="true"</c:if>>			 
  
  -				  <c:out value="${roleName}"/>
  -			    </option>
  -			</c:forEach>
  -		</select>      
  -    </td>
  -  </tr>
  -
  -  <!-- Select Profiling Rules -->
  -  <tr colspan="2" align="right">
  -    <td nowrap class="portlet-section-alternate" align="right">Profiling Rule:&nbsp;</td>
  -    <td class="portlet-section-body" align="left">
  - 		<select name="jetspeedRules" class="portlet-form-field-label">		
  -			<option value=""/> 		
  -			<c:forEach var="ruleName" items="${jetspeedRules}">
  -			    <option value="<c:out value='${ruleName}'/>"
  -  			    <c:if test="${ruleName == 'role-fallback'}">selected="true"</c:if>>
  -				  <c:out value="${ruleName}"/>
  -			    </option>
  -			</c:forEach>
  -		</select>      
  -    </td>
  -  </tr>
  +  <c:set var="defaultRole" value='${prefs["defaultRole"][0]}'/>
  +  <c:set var="defaultProfile" value='${prefs["defaultProfile"][0]}'/>
  +  
  +  <c:choose>
  +    <c:when test='${prefs["showRoleForAddUser"][0]}'>
  +      <!-- Select Roles -->
  +      <tr colspan="2" align="right">
  +        <td nowrap class="portlet-section-alternate" align="right">Default Role:&nbsp;</td>
  +        <td class="portlet-section-body" align="left">
  +     		<select name="jetspeedRoles" class="portlet-form-field-label">		
  +    			<option value=""/> 		 		
  +    			<c:forEach var="roleName" items="${jetspeedRoles}">			    
  +    			    <option value="<c:out value='${roleName}'/>"
  +      			    <c:if test="${roleName == defaultRole}">selected="true"</c:if>>
		    
  +    				  <c:out value="${roleName}"/>
  +    			    </option>
  +    			</c:forEach>
  +    		</select>      
  +        </td>
  +      </tr>
  +    </c:when>
  +    <c:otherwise>
  +      <input type="hidden" name="jetspeedRoles" value="<c:out value="${defaultRole}"/>">
  +    </c:otherwise>
  +  </c:choose>
  +
  +  <c:choose>
  +    <c:when test='${prefs["showProfileForAddUser"][0]}'>
  +      <!-- Select Profiling Rules -->
  +      <tr colspan="2" align="right">
  +        <td nowrap class="portlet-section-alternate" align="right">Profiling Rule:&nbsp;</td>
  +        <td class="portlet-section-body" align="left">
  +     		<select name="jetspeedRules" class="portlet-form-field-label">		
  +    			<option value=""/> 		
  +    			<c:forEach var="ruleName" items="${jetspeedRules}">
  +    			    <option value="<c:out value='${ruleName}'/>"
  +      			    <c:if test="${ruleName == defaultProfile}">selected="true"</c:if>>
  +    				  <c:out value="${ruleName}"/>
  +    			    </option>
  +    			</c:forEach>
  +    		</select>      
  +        </td>
  +      </tr>
  +    </c:when>
  +    <c:otherwise>
  +      <input type="hidden" name="jetspeedRules" value="<c:out value="${defaultProfile}"/>">
  +    </c:otherwise>
  +  </c:choose>
     
   </table>
   <br/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message