Author: ktlili
Date: Thu Aug 30 15:46:12 2007
New Revision: 18312
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18312&repname=
=3Djahia
Log:
- keep choosen values in selection group
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/users/se=
lectgroups.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/us=
ers/selectgroups.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/users/selectgroups.inc&rev=3D1831=
2&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/users/se=
lectgroups.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/users/se=
lectgroups.inc Thu Aug 30 15:46:12 2007
@@ -24,6 +24,19 @@
<%@ page import=3D"java.util.Set"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<jahia:i18n/>
+<%!
+public boolean isInParam(HttpServletRequest request,String name, String va=
lue){
+ String[] parameter =3D request.getParameterValues(name);
+ if(parameter !=3D null){
+ for(int i =3D 0;i<parameter.length; i++){
+ if(parameter[i].equalsIgnoreCase(value)){
+ return true;
+ }
+ } =
+ }
+ return false;
+}
+%>
=
<%
final ArrayList resultList =3D (ArrayList) engineMap.get("resultList");
@@ -34,6 +47,9 @@
final JahiaSite jahiaSite =3D (JahiaSite) engineMap.get("currentSite");
final Boolean selectSite =3D (Boolean) engineMap.get("selectSite");
Enumeration siteEnum =3D siteList.elements();
+ String propertiesParameters[] =3D request.getParameterValues("properti=
es");
+ String providersParameters[] =3D request.getParameterValues("providers=
");
+
%>
=
<script type=3D"text/javascript">
@@ -120,26 +136,26 @@
<ul class=3D"noStyle">
<li>
<input type=3D"radio" name=3D"searchIn" value=3D"allPr=
ops" checked=3D"checked"
- onclick=3D"disableCheckBox(properties);"> =
<jahia:engineResourceBundle
- resourceName=3D"org.jahia.engines.users.SelectUG_E=
ngine.allProperties.label"/>
+ onclick=3D"disableCheckBox(properties);" <%if(i=
sInParam(request,"searchIn","allProps")){%> checked<%}%>> <jahia:engin=
eResourceBundle
+ resourceName=3D"org.jahia.engines.users.SelectUG_E=
ngine.allProperties.label" />
</li>
<li>
<input type=3D"radio" name=3D"searchIn" value=3D"prope=
rties"
- onclick=3D"enableCheckbox(properties);"> <=
jahia:engineResourceBundle
+ onclick=3D"enableCheckbox(properties);" <%if(is=
InParam(request,"searchIn","properties")){%> checked<%}%>> <jahia:engi=
neResourceBundle
resourceName=3D"org.jahia.engines.users.SelectUG_E=
ngine.properties.label"/>:
<ul class=3D"noStyle">
<li>
- <input type=3D"checkbox" name=3D"properties" v=
alue=3D"groupname" disabled=3D"disabled">
+ <input type=3D"checkbox" name=3D"properties" v=
alue=3D"groupname" <%if(propertiesParameters =3D=3D null || propertiesPara=
meters.length =3D=3D 0){%> disabled=3D"disabled" <%}%><%if(isInParam(reques=
t,"properties","groupname")){%> checked<%}else{%><%}%>>
<jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.grou=
pname.label"/>
</li>
<li>
- <input type=3D"checkbox" name=3D"properties" v=
alue=3D"description" disabled=3D"disabled">
+ <input type=3D"checkbox" name=3D"properties" v=
alue=3D"description" <%if(propertiesParameters =3D=3D null ||propertiesPara=
meters.length =3D=3D 0){%> disabled=3D"disabled" <%}%> <%if(isInParam(reque=
st,"properties","description")){%> checked<%}%>>
<jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.user=
s.SelectUG_Engine.description.label"/> (LDAP)
</li>
<li>
- <input type=3D"checkbox" name=3D"properties" v=
alue=3D"members" disabled=3D"disabled">
+ <input type=3D"checkbox" name=3D"properties" v=
alue=3D"members" <%if(propertiesParameters =3D=3D null ||propertiesParamete=
rs.length =3D=3D 0){%> disabled=3D"disabled" <%}%>" <%if(isInParam(request,=
"properties","members")){%> checked<%}%>>
<jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.user=
s.SelectUG_Engine.members.label"/> (LDAP)
</li>
@@ -164,14 +180,14 @@
<% } %>
<li>
<input type=3D"radio" name=3D"storedOn" value=3D"every=
where"
- <% if (providerList.size() > 1) { %> checked=3D"checke=
d" <% } %>
+ <% if (providersParameters =3D=3D null || providersPar=
ameters.length =3D=3D 0) { %> checked=3D"checked" <% } %>
onclick=3D"disabl=
eCheckBox(providers);">
<jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.users.Select=
UG_Engine.everywhere.label"/>
</li>
<li>
<input type=3D"radio" name=3D"storedOn" value=3D"provi=
ders"
- <% if (providerList.size() <=3D 1) { %> checked=3D"che=
cked" <% } %>
+ <% if (providersParameters !=3D null && providersParam=
eters.length > 0) { %> checked=3D"checked" <% } %>
onclick=3D"enabl=
eCheckbox(providers);">
<jahia:engineResourceBundle resourceName=3D"org.jahia.=
engines.users.SelectUG_Engine.providers.label"/>
:
@@ -183,8 +199,8 @@
%>
<li>
<input type=3D"checkbox" name=3D"providers" va=
lue=3D"<%=3DcurProvider.getKey()%>"
- disabled=3D"disabled"
- <% if (providerList.size() <=3D 1) { %> checke=
d=3D"checked" <% } %>>
+ <%if(providersParameters =3D=3D null ||=
providersParameters.length =3D=3D 0){%>disabled=3D"disabled"<%}%>
+ <% if (isInParam(request,"providers",curProvid=
er.getKey())) { %> checked=3D"checked" <% } %>>
<jahia:engineResourceBundle
resourceName=3D'<%=3D"org.jahia.engine=
s.users.SelectUG_Engine.providers." + curProvider.getKey() + ".label"%>'/>
(<%=3DcurProvider.getKey()%>)
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
