Author: dpillot
Date: Thu Jun 14 19:16:25 2007
New Revision: 710
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D710&repname=
=3Dcorporate_portal_templates_v2
Log:
removed site localisation for groups (incompatible with ldap)
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/org/jahia/corporat=
eportalv2/ldap/GroupWrapper.java
branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_search.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/org/jahia/co=
rporateportalv2/ldap/GroupWrapper.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/org/jahia/corporateportalv2/ldap/GroupWrapp=
er.java&rev=3D710&repname=3Dcorporate_portal_templates_v2
=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/src/java/jahiatemplates/org/jahia/corporat=
eportalv2/ldap/GroupWrapper.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/org/jahia/corporat=
eportalv2/ldap/GroupWrapper.java Thu Jun 14 19:16:25 2007
@@ -22,10 +22,6 @@
import org.displaytag.decorator.TableDecorator;
import org.jahia.services.usermanager.JahiaGroup;
import org.jahia.services.usermanager.JahiaUser;
-import org.jahia.services.sites.JahiaSite;
-import org.jahia.services.sites.JahiaSitesService;
-import org.jahia.registries.ServicesRegistry;
-import org.jahia.exceptions.JahiaException;
=
import java.security.Principal;
import java.util.Enumeration;
@@ -37,12 +33,11 @@
*/
public class GroupWrapper extends TableDecorator {
private static org.apache.log4j.Logger logger =3D Logger.getLogger(Gro=
upWrapper.class);
- private static final JahiaSitesService siteService =3D ServicesRegistr=
y.getInstance().getJahiaSitesService();
private static long time =3D 0;
=
public GroupWrapper() {
super();
- time=3D0; =
+ time=3D0;
}
=
public String getGroupName() {
@@ -111,20 +106,7 @@
}
return "";
}
- public String getSiteName() {
- Principal p =3D (Principal) this.getCurrentRowObject();
=
- if (p instanceof JahiaGroup) {
- JahiaGroup g =3D (JahiaGroup) p;
- try {
- JahiaSite site =3D siteService.getSite(g.getSiteID());
- return site.getTitle();
- } catch (JahiaException e) {
- logger.error(e);
- }
- }
- return "";
- }
/**
* internal method to get a property value
*
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_search.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/ldap_search.jsp&rev=3D710&repname=3Dcorporate_portal_templa=
tes_v2
=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/src/jsp/ldap_search.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_search.jsp Thu Jun 14 19:16:2=
5 2007
@@ -972,9 +972,9 @@
//test sorting
String titlelink =3D "";
// loop to construct the table colums of displaytag
- String[] tablelabels =3D {"name", "sitelocalisation", "memberc=
ount"};
- String[] keylabels =3D {"groupName", "siteName", "memberCount"=
};
- for (int j =3D 0; j < 3; j++) {
+ String[] tablelabels =3D {"name", "membercount"};
+ String[] keylabels =3D {"groupName", "memberCount"};
+ for (int j =3D 0; j < 2; j++) {
titlelink =3D "<a href=3D\"javascript:sort(" + j + ")\">" =
+ getRessource("ldap.group." + tablelabels[j], loc) + "</a>";
=
%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
