Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
In directory
james.mmbase.org:/tmp/cvs-serv24191/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
Modified Files:
Tag: v1_3
DeleteAction.java RestoreAction.java
Log Message:
CMSC-427
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
See also: http://www.mmbase.org/jira/browse/CMSC-427
Index: DeleteAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- DeleteAction.java 1 Aug 2007 15:15:03 -0000 1.6
+++ DeleteAction.java 3 Mar 2008 10:32:12 -0000 1.6.2.1
@@ -32,6 +32,10 @@
public ActionForward execute(ActionMapping mapping,
HttpServletRequest request, Cloud cloud) throws Exception {
+ if (!RepositoryUtil.hasRecyclebinRights(cloud, "webmaster")) {
+ return redirectLogin(request);
+ }
+
String action = getParameter(request, "action");
if ("deleteall".equals(action)) {
@@ -63,10 +67,4 @@
}
return mapping.findForward(SUCCESS);
}
-
- @Override
- public String getRequiredRankStr() {
- return ADMINISTRATOR;
- }
-
}
Index: RestoreAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- RestoreAction.java 1 Aug 2007 15:15:03 -0000 1.3
+++ RestoreAction.java 3 Mar 2008 10:32:12 -0000 1.3.2.1
@@ -28,6 +28,10 @@
public ActionForward execute(ActionMapping mapping,
HttpServletRequest request, Cloud cloud) throws Exception {
+ if (!RepositoryUtil.hasRecyclebinRights(cloud, "webmaster")) {
+ return redirectLogin(request);
+ }
+
String objectnumber = getParameter(request, "objectnumber");
Node objectNode = cloud.getNode(objectnumber);
@@ -54,10 +58,4 @@
}
return mapping.findForward(SUCCESS);
}
-
- @Override
- public String getRequiredRankStr() {
- return ADMINISTRATOR;
- }
-
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
