Author: knguyen
Date: Fri Sep 21 12:35:18 2007
New Revision: 18616
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18616&repname=
=3Djahia
Log:
JAHIA-2168: fix User Advanced Setting icon in DevMode.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/usersession/u=
serSettings.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/EngineRend=
erer.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/userses=
sion/userSettings.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/usersession/userSettings.java&rev=3D18=
616&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/java/org/jahia/ajax/usersession/u=
serSettings.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/usersession/u=
serSettings.java Fri Sep 21 12:35:18 2007
@@ -125,5 +125,29 @@
}
logger.debug("found " + paramName + " param: " + paramValue + " ->=
setting the session");
}
+
+ /**
+ * Init the session with user settings for Development Mode
+ *
+ * @param therequest
+ */
+ public static void initSessionSettingForDevMode(HttpServletRequest the=
request){
+ initSessionSettingForDevMode(therequest, WF_VISU_ENABLED);
+ initSessionSettingForDevMode(therequest, TBP_VISU_ENABLED);
+ initSessionSettingForDevMode(therequest, ACL_VISU_ENABLED);
+ }
+
+ protected static void initSessionSettingForDevMode(HttpServletRequest =
therequest,
+ String settingName){
+ final boolean isDevMode =3D Jahia.getSettings().isDevelopmentMode(=
);
+ String settingValue =3D (String)therequest.getSession().getAttribu=
te(settingName);
+ Boolean result =3D new Boolean(isDevMode);
+ if ( settingValue !=3D null ){
+ result =3D Boolean.valueOf(settingValue);
+ } else if ( isDevMode ) {
+ therequest.getSession().setAttribute(settingName,result.toStri=
ng());
+ }
+ }
+
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/Engi=
neRenderer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/EngineRenderer.java&rev=3D18616&rep=
name=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/java/org/jahia/engines/EngineRend=
erer.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/EngineRend=
erer.java Fri Sep 21 12:35:18 2007
@@ -31,6 +31,7 @@
import org.jahia.params.ProcessingContext;
import org.jahia.utils.FileUtils;
import org.jahia.spring.aop.interceptor.SilentJamonPerformanceMonitorInter=
ceptor;
+import org.jahia.ajax.usersession.userSettings;
=
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -197,6 +198,8 @@
logger.debug ("Dispatching request to " + fileName +
" using render type " + renderType + "...");
=
+ userSettings.initSessionSettingForDevMode(request);
+ =
Monitor listenerMonitor =3D null;
if (monitorLogger.isDebugEnabled()) listenerMonitor =3D Monito=
rFactory.start(fileName);
if (renderType.intValue () =3D=3D JahiaEngine.RENDERTYPE_INCLU=
DE) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLTool=
Box.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.java&rev=3D18616&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/java/org/jahia/gui/HTMLToolBox.ja=
va (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va Fri Sep 21 12:35:18 2007
@@ -1253,6 +1253,19 @@
return !(parentContentObject !=3D null && parentContentObject.isPi=
cker());
}
=
+ protected Boolean getUserInitialSettingForDevMode(HttpServletRequest t=
herequest,
+ String settingName){
+ final boolean isDevMode =3D Jahia.getSettings().isDevelopmentMode(=
);
+ String settingValue =3D (String)therequest.getSession().getAttribu=
te(settingName);
+ Boolean result =3D new Boolean(isDevMode);
+ if ( settingValue !=3D null ){
+ result =3D Boolean.valueOf(settingValue);
+ } else if ( isDevMode ) {
+ therequest.getSession().setAttribute(settingName,result.toStri=
ng());
+ }
+ return result;
+ }
+
/**
* Generates the HTML for the start of the action menu.
*
@@ -1296,9 +1309,9 @@
// to get flags to enable workflow and tbpublishing visu and checks
// if dev mode is actived so all modules and semaphores are actived
final boolean isDevMode =3D Jahia.getSettings().isDevelopmentMode(=
);
- Boolean displayWorkflowStates =3D Boolean.valueOf(isDevMode); //de=
fault
- Boolean displayTimeBasedPublishing =3D Boolean.valueOf(isDevMode);=
//default
- Boolean aclDifferenceParam =3D Boolean.valueOf(isDevMode);
+ Boolean displayWorkflowStates =3D getUserInitialSettingForDevMode(=
therequest,userSettings.WF_VISU_ENABLED);
+ Boolean displayTimeBasedPublishing =3D getUserInitialSettingForDev=
Mode(therequest,userSettings.TBP_VISU_ENABLED);
+ Boolean aclDifferenceParam =3D getUserInitialSettingForDevMode(the=
request,userSettings.ACL_VISU_ENABLED);
if (!isDevMode) {
try {
displayWorkflowStates =3D Boolean.valueOf((String) therequ=
est.getSession().getAttribute(userSettings.WF_VISU_ENABLED));
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
