Author: ktlili
Date: Fri Jun 1 15:19:53 2007
New Revision: 17447
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17447&repname=
=3Djahia
Log:
- RE: [- fix for select user window: by default search "*"] JIRA [JAHIA-189=
2]
Modified:
trunk/core/src/java/org/jahia/engines/users/SelectUG_Engine.java
Modified: trunk/core/src/java/org/jahia/engines/users/SelectUG_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/users/SelectUG_Engine.java&rev=3D17447&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
--- trunk/core/src/java/org/jahia/engines/users/SelectUG_Engine.java (origi=
nal)
+++ trunk/core/src/java/org/jahia/engines/users/SelectUG_Engine.java Fri Ju=
n 1 15:19:53 2007
@@ -255,24 +255,26 @@
engineMap.put("groupList", groupList);
}
=
- if (searchString !=3D null && searchString.length() > 0) {
+ //if (searchString !=3D null && searchString.length() > 0) {
Set searchResults =3D PrincipalViewHelper.getSearchResult(=
searchIn, siteID, searchString, searchInProps, storedOn, providers);
if (searchResults !=3D null) {
ArrayList resultList =3D new ArrayList();
Iterator resultListEnum =3D searchResults.iterator();
while (resultListEnum.hasNext()) {
JahiaUser user =3D (JahiaUser) resultListEnum.next=
();
- String usrname =3D JahiaString.adjustStringSize(us=
er.getUsername(), userNameWidth.intValue());
- String resultValue =3D "10000000r-- " + usrname + =
"u" + user.getName();
- String result =3D " " + pvh.getPrincipalTextOption=
(user);
- resultList.add(JahiaTools.replacePattern(resultVal=
ue, " ", " "));
- resultList.add(JahiaTools.replacePattern(result, "=
", " "));
+ if(user !=3D null){
+ String usrname =3D JahiaString.adjustStringSiz=
e(user.getUsername(), userNameWidth.intValue());
+ String resultValue =3D "10000000r-- " + usrnam=
e + "u" + user.getName();
+ String result =3D " " + pvh.getPrincipalTextOp=
tion(user);
+ resultList.add(JahiaTools.replacePattern(resul=
tValue, " ", " "));
+ resultList.add(JahiaTools.replacePattern(resul=
t, " ", " "));
+ }
}
engineMap.put("resultList", resultList);
}
- } else {
+ /*} else {
engineMap.put("resultList", new ArrayList());
- }
+ }*/
engineMap.put ("screen", "edit");
engineMap.put ("selectUGEngine", "selectUsers");
} else if (theScreen.equals ("searchGroups")) {
@@ -318,26 +320,28 @@
}
=
// now let's perform the search for the groups
- if (searchString !=3D null && searchString.length() > 0) {
+ //if (searchString !=3D null && searchString.length() > 0) { =
=
Set searchResults =3D PrincipalViewHelper.getGroupSearchRe=
sult(searchIn, siteID, searchString, searchInProps, storedOn, providers);
if (searchResults !=3D null) {
ArrayList resultList =3D new ArrayList();
Iterator resultListEnum =3D searchResults.iterator();
while (resultListEnum.hasNext()) {
JahiaGroup group =3D (JahiaGroup) resultListEnum.n=
ext();
- String provider =3D JahiaString.adjustStringSize(g=
roup.getProviderName(), 6) + " ";
- // Construct a displayable groupname
- String grpname =3D JahiaString.adjustStringSize(gr=
oup.getGroupname(), userNameWidth.intValue());
- String resultValue =3D "10000000r-- " + grpname + =
"g" + group.getName();
- String result =3D " " + pvh.getPrincipalTextOption=
(group);
- resultList.add(JahiaTools.replacePattern(resultVal=
ue, " ", " "));
- resultList.add(JahiaTools.replacePattern(result, "=
", " "));
+ if(group !=3D null){
+ String provider =3D JahiaString.adjustStringSi=
ze(group.getProviderName(), 6) + " ";
+ // Construct a displayable groupname
+ String grpname =3D JahiaString.adjustStringSiz=
e(group.getGroupname(), userNameWidth.intValue());
+ String resultValue =3D "10000000r-- " + grpnam=
e + "g" + group.getName();
+ String result =3D " " + pvh.getPrincipalTextOp=
tion(group);
+ resultList.add(JahiaTools.replacePattern(resul=
tValue, " ", " "));
+ resultList.add(JahiaTools.replacePattern(resul=
t, " ", " "));
+ }
}
engineMap.put("resultList", resultList);
}
- } else {
+ /*} else {
engineMap.put("resultList", new ArrayList());
- }
+ }*/
engineMap.put("screen", "searchGroups");
engineMap.put("selectUGEngine", "selectGroups");
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
