Author: dpillot
Date: Fri Sep 21 14:38:10 2007
New Revision: 18617
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18617&repname=
=3Djahia
Log:
http://www.jahia.net/jira/browse/JAHIA-2116
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/webapp/jsp/jahia/topbar/aes.inc
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=
617&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 14:38:10 2007
@@ -27,6 +27,7 @@
* @author joe pillot
* @see org.jahia.ajax.monitors.PDisplayAction
* @see org.jahia.ajax.chat.chatAction
+ * @version $Id$
*/
public class userSettings extends AjaxAction {
private static final Logger logger =3D Logger.getLogger(userSettings.c=
lass);
@@ -105,6 +106,13 @@
return null;
}
=
+ /**
+ * internal methods to check params from the request and synchronize t=
hem with user'session
+ * @param paramName
+ * @param sessionAttributeName
+ * @param request
+ * @param session
+ */
private void setParam(String paramName,
String sessionAttributeName,
HttpServletRequest request,
@@ -116,14 +124,20 @@
else if (paramName.equalsIgnoreCase("chat")) value =3D Jahia.getSe=
ttings().isChatDisp();
else if (paramName.equalsIgnoreCase("monitor display")) value =3D =
Jahia.getSettings().isPdispDisp();
else if (paramName.equalsIgnoreCase("acl")) value =3D Jahia.getSet=
tings().isAclDisp();
+
+ logger.debug(sessionAttributeName+"=3D"+getParameter(request, sess=
ionAttributeName, String.valueOf(value)));
String paramValue =3D Boolean.toString(getParameter(request, sessi=
onAttributeName, String.valueOf(value)).equals("true"));
- // check if changing some(s) flag(s)
+ //got the value from session
final String currentSessionAttributeValue =3D (String) session.get=
Attribute(sessionAttributeName);
- if (currentSessionAttributeValue !=3D null && !currentSessionAttri=
buteValue.equals(paramValue)) {
+ // check if changing some(s) flag(s)
+ if (currentSessionAttributeValue !=3D null
+ && request.getParameter(sessionAttributeName)!=3Dnull
+ && !currentSessionAttributeValue.equals(paramValue)) {
needToPurge =3D true;
session.setAttribute(sessionAttributeName, paramValue);
+ logger.debug("found " + paramName + " param: " + paramValue + =
" ->setting the session");
}
- logger.debug("found " + paramName + " param: " + paramValue + " ->=
setting the session");
+
}
=
/**
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/aes=
.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/topbar/aes.inc&rev=3D18617&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/topbar/aes.inc (=
original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/aes.inc F=
ri Sep 21 14:38:10 2007
@@ -25,8 +25,8 @@
if (thesize !=3D null && !thesize.equalsIgnoreCase("") && !thesize.equ=
alsIgnoreCase("null")) {
if (thesize.indexOf("%") !=3D -1) ispercent =3D true;
} else {
- ispercent =3D true;
- thesize =3D "80%";//default for templates specific
+ //ispercent =3D true;
+ thesize =3D "1004";//default for templates specific
}
=
final SettingsBean settingsBean =3D Jahia.getSettings();
@@ -104,20 +104,40 @@
var changedChat =3D false;
var changedPDisplay =3D false;
var changedACLDiff =3D false;
+
+ //set the vars from session values
var displayWorkFlowStates =3D <%=3DdisplayWorkFlowStates%>;
var displayTimeBasedPublishingStates =3D <%=3DdisplayTimeBasedPublishi=
ngStates%>;
var displayACLDifferences =3D <%=3DdisplayACLDifferences%>;
+
var displayChat =3D <%=3DdisplayChat%>;
var displayProcessDisplay =3D <%=3DdisplayProcessDisplay%>;
+
//usersettings functions
function changeUSettings(setting) {
changedUS =3D true;
$('iconusersetting').src =3D "<content:serverHttpPath />/jsp/jahia=
/engines/images/icons/delete3.gif";
- if (setting =3D=3D "tbp") changedTBP =3D !changedTBP;
- else if (setting =3D=3D "chat") changedChat =3D !changedChat;
- else if (setting =3D=3D "wf") changedWorkflow =3D !changedWorkflow;
- else if (setting =3D=3D "pdisp") changedPDisplay =3D !changedPDisp=
lay;
- else if (setting =3D=3D "acl") changedACLDiff =3D !changedACLDiff;
+ //alert(setting);
+ if (setting =3D=3D "tbp") {
+ changedTBP =3D !changedTBP;
+ //alert(changedTBP);
+ }
+ else if (setting =3D=3D "chat") {
+ changedChat =3D !changedChat;
+ //alert(changedChat);
+ }
+ else if (setting =3D=3D "wf") {
+ changedWorkflow =3D !changedWorkflow;
+ //alert(changedWorkflow);
+ }
+ else if (setting =3D=3D "pdisp") {
+ changedPDisplay =3D !changedPDisplay;
+ //alert(changedPDisplay);
+ }
+ else if (setting =3D=3D "acl") {
+ changedACLDiff =3D !changedACLDiff;
+ //alert(changedACLDiff);
+ }
=
if ($('wflowFire').checked && $('tbpublishFire').checked && $('acl=
Fire').checked) {
$('allFires').checked =3D true;
@@ -169,7 +189,7 @@
} else {
if ($('tbpublishFire').checked =3D=3D true) $('tbpublishFire')=
.click();
if ($('wflowFire').checked =3D=3D true) $('wflowFire').click();
- if ($('aclFire').checked !=3D true) $('aclFire').click();
+ if ($('aclFire').checked =3D=3D true) $('aclFire').click();
}
}
// errors
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
