Author: sshyrkov
Date: Fri Dec 14 22:03:51 2007
New Revision: 847
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D847&repname=
=3Dcorporate_portal_templates_v2
Log:
CONE-64: Do not break event processing if we are outside the scope of an ad=
d/update container engine. We need to call all event listeners in any case.
http://www.jahia.net/jira/browse/CONE-64
Modified:
trunk/src/jsp/eventlistener.jsp
Modified: trunk/src/jsp/eventlistener.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/eventli=
stener.jsp&rev=3D847&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
--- trunk/src/jsp/eventlistener.jsp (original)
+++ trunk/src/jsp/eventlistener.jsp Fri Dec 14 22:03:51 2007
@@ -55,20 +55,25 @@
String DEFAULTCATEGORIES_SESSIONKEYPREFIX =3D "defaultCategories_";
=
if ( eventsToTrap.contains(eventName)){
+ JahiaContainer theContainer =3D (JahiaContainer)jahiaEvent.getObject();
+ String languageCode =3D jParams.getLocale().getLanguage();
+ HashSet updatedFields =3D null;
HashMap engineMap =3D (HashMap) jParams.getSessionState().getAttribute(
"=
jahia_session_engineMap" );
if (engineMap =3D=3D null) {
logger.debug("No engineMap found, aborting processing");
- return;
+ //return;
+ languageCode =3D (String)engineMap.get("languageCode");
+ updatedFields =3D (HashSet)engineMap.get("updated.fields");
}
- String languageCode =3D (String)engineMap.get("languageCode");
- HashSet updatedFields =3D (HashSet)engineMap.get("updated.fields");
if (updatedFields =3D=3D null) {
updatedFields =3D new HashSet();
engineMap.put("updated.fields", updatedFields);
}
ContainerFieldsEditHelper feh =3D (ContainerFieldsEditHelper) engineMa=
p.get(AddContainer_Engine.
ENGINE_NAME + "." + FieldsEditHelperAbstract.FIELDS_EDIT_HELPER_CO=
NTEXTID);
- JahiaContainer theContainer =3D (JahiaContainer)jahiaEvent.getObject();
+ if (null =3D=3D feh) {
+ feh =3D new ContainerFieldsEditHelper(theContainer);
+ }
%>
<%@ include file=3D"blogs/eventlistener.inc"%>
<%@ include file=3D"news/eventlistener.inc"%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
