Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
In directory
james.mmbase.org:/tmp/cvs-serv24208/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
Modified Files:
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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- DeleteAction.java 26 Nov 2007 11:43:45 -0000 1.7
+++ DeleteAction.java 3 Mar 2008 10:32:18 -0000 1.8
@@ -31,6 +31,10 @@
@Override
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)) {
@@ -62,11 +66,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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- RestoreAction.java 26 Nov 2007 11:43:45 -0000 1.4
+++ RestoreAction.java 3 Mar 2008 10:32:18 -0000 1.5
@@ -26,6 +26,10 @@
@Override
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);
@@ -52,11 +56,4 @@
}
return mapping.findForward(SUCCESS);
}
-
-
- @Override
- public String getRequiredRankStr() {
- return ADMINISTRATOR;
- }
-
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
