knguyen 2004/08/17 15:55:20 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/engines EngineMessages.java
src/java/org/jahia/engines/pages PageProperties_Engine.java
src/java/org/jahia/params ParamBean.java
src/java/org/jahia/services/htmlparser
HtmlParserBaseService.java
src/java/org/jahia/services/version
PageRevisionsCompositor.java
src/java/org/jahia/views/engines/versioning/pages/actions
PagesVersioningAction.java
Log:
- compare mode available only with write or admin
- versioning allowed for write or admin
Revision Changes Path
1.4.4.1 +11 -1 jahia/src/java/org/jahia/engines/EngineMessages.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/EngineMessages.java.diff?r1=1.4&r2=1.4.4.1&f=h
1.48.2.3 +5 -3
jahia/src/java/org/jahia/engines/pages/PageProperties_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/pages/PageProperties_Engine.java.diff?r1=1.48.2.2&r2=1.48.2.3&f=h
1.149.2.2 +9 -0 jahia/src/java/org/jahia/params/ParamBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/params/ParamBean.java.diff?r1=1.149.2.1&r2=1.149.2.2&f=h
1.3.4.2 +1 -0
jahia/src/java/org/jahia/services/htmlparser/HtmlParserBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/htmlparser/HtmlParserBaseService.java.diff?r1=1.3.4.1&r2=1.3.4.2&f=h
1.2.4.1 +9 -1
jahia/src/java/org/jahia/services/version/PageRevisionsCompositor.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/version/PageRevisionsCompositor.java.diff?r1=1.2&r2=1.2.4.1&f=h
1.19.2.1 +6 -1
jahia/src/java/org/jahia/views/engines/versioning/pages/actions/PagesVersioningAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/views/engines/versioning/pages/actions/PagesVersioningAction.java.diff?r1=1.19&r2=1.19.2.1&f=h
Index: EngineMessages.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/engines/Attic/EngineMessages.java,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- EngineMessages.java 26 Nov 2003 14:49:54 -0000 1.4
+++ EngineMessages.java 17 Aug 2004 13:55:18 -0000 1.4.4.1
@@ -92,6 +92,16 @@
return messages.isEmpty ();
}
+ /**
+ * save message as contextPrefix + CONTEXT_KEY attribute
+ *
+ * @param contextPrefix String
+ * @param request ServletRequest
+ */
+ public void saveMessages (String contextPrefix, ServletRequest request) {
+ request.setAttribute (contextPrefix + CONTEXT_KEY , this);
+ }
+
public void saveMessages (ServletRequest request) {
request.setAttribute (CONTEXT_KEY, this);
}
@@ -104,4 +114,4 @@
pageContext.setAttribute (CONTEXT_KEY, this, scope);
}
-}
\ No newline at end of file
+}
Index: PageProperties_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/engines/pages/Attic/PageProperties_Engine.java,v
retrieving revision 1.48.2.2
retrieving revision 1.48.2.3
diff -u -r1.48.2.2 -r1.48.2.3
--- PageProperties_Engine.java 6 Aug 2004 17:59:38 -0000 1.48.2.2
+++ PageProperties_Engine.java 17 Aug 2004 13:55:18 -0000 1.48.2.3
@@ -1,4 +1,4 @@
-// $Id: PageProperties_Engine.java,v 1.48.2.2 2004/08/06 17:59:38 shuber Exp $
+// $Id: PageProperties_Engine.java,v 1.48.2.3 2004/08/17 13:55:18 knguyen Exp $
//
//
// ____.
@@ -235,7 +235,8 @@
}
}
} else if (lastScreen.equals ("versioning")) {
- if (engineMap.get ("adminAccess") != null) {
+ if (engineMap.get ("writeAccess") != null
+ ||engineMap.get ("adminAccess") != null) {
engineMap.put (RENDER_TYPE_PARAM,
new Integer (JahiaEngine.RENDERTYPE_FORWARD));
// reset engine map to default value
@@ -303,7 +304,8 @@
throw new JahiaForbiddenAccessException ();
}
} else if (theScreen.equals ("versioning")) {
- if (engineMap.get ("adminAccess") != null) {
+ if (engineMap.get ("writeAccess") != null
+ || engineMap.get ("adminAccess") != null) {
// as we switch to versioning engine, we release the lock first
if (jParams.settings ().areLocksActivated ()) {
Index: ParamBean.java
===================================================================
RCS file: /home/cvs/repository/jahia/src/java/org/jahia/params/Attic/ParamBean.java,v
retrieving revision 1.149.2.1
retrieving revision 1.149.2.2
diff -u -r1.149.2.1 -r1.149.2.2
--- ParamBean.java 28 May 2004 15:34:10 -0000 1.149.2.1
+++ ParamBean.java 17 Aug 2004 13:55:18 -0000 1.149.2.2
@@ -3077,6 +3077,15 @@
if (COMPARE.equals(getParameter(OPERATION_MODE_PARAMETER))) {
this.opMode = COMPARE;
+
+ // User has write rights to edit?
+ if (! (contentPage.checkWriteAccess(theUser)
+ || contentPage.checkAdminAccess(theUser)))
+ // No -> Normal mode !
+ {
+ this.opMode = NORMAL;
+ }
+
}
if (EDIT.equals(getParameter(OPERATION_MODE_PARAMETER))) {
Index: HtmlParserBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/htmlparser/Attic/HtmlParserBaseService.java,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- HtmlParserBaseService.java 26 Jul 2004 16:48:39 -0000 1.3.4.1
+++ HtmlParserBaseService.java 17 Aug 2004 13:55:19 -0000 1.3.4.2
@@ -331,6 +331,7 @@
/**
* Check if there is any html parsing errors
+ * If there is any error, store an MessageError with property key = "htmlParser"
*
* @param value String, the result of a previous Html parsing
* @return EngineMessages
Index: PageRevisionsCompositor.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/version/Attic/PageRevisionsCompositor.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- PageRevisionsCompositor.java 30 Jun 2003 22:31:12 -0000 1.2
+++ PageRevisionsCompositor.java 17 Aug 2004 13:55:19 -0000 1.2.4.1
@@ -62,6 +62,14 @@
ContentTreeStatusInterface contentTreeStatus, int currentPageLevel)
throws JahiaException{
+ //check permission
+ if ( !contentObject.checkAdminAccess(this.getUser())
+ && !contentObject.checkWriteAccess(this.getUser()) ){
+ // stop processing childs too.
+ contentTreeStatus.setContinueWithChilds(false);
+ return;
+ }
+
// check to skip revisions of deleted content or not
boolean hasActiveEntries
= contentObject.hasActiveEntries();
@@ -203,4 +211,4 @@
}
this.typeOfRevisions = value;
}
-}
\ No newline at end of file
+}
Index: PagesVersioningAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/views/engines/versioning/pages/actions/Attic/PagesVersioningAction.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- PagesVersioningAction.java 18 Dec 2003 14:38:20 -0000 1.19
+++ PagesVersioningAction.java 17 Aug 2004 13:55:19 -0000 1.19.2.1
@@ -119,9 +119,14 @@
if ( engineCommonData.getParamBean().getPage()
.checkAdminAccess(engineCommonData.getParamBean().getUser()) ){
jahiaEngineButtonsHelper.addRightsButton();
- jahiaEngineButtonsHelper.addVersioningButton();
jahiaEngineButtonsHelper.addLogsButton();
}
+ if ( engineCommonData.getParamBean().getPage()
+ .checkAdminAccess(engineCommonData.getParamBean().getUser()) ||
+ engineCommonData.getParamBean().getPage()
+ .checkWriteAccess(engineCommonData.getParamBean().getUser()) ){
+ jahiaEngineButtonsHelper.addVersioningButton();
+ }
request.setAttribute(JahiaEngineButtonsHelper.JAHIA_ENGINE_BUTTONS_HELPER,
jahiaEngineButtonsHelper);
