Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
In directory 
james.mmbase.org:/tmp/cvs-serv10565/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms

Modified Files:
      Tag: v1_3
        DeleteSecondaryContentAction.java 
Log Message:
CMSC-853 DeleteSecondaryContentAction allows SITEADMIN only


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
See also: http://www.mmbase.org/jira/browse/CMSC-853


Index: DeleteSecondaryContentAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/DeleteSecondaryContentAction.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- DeleteSecondaryContentAction.java   11 Feb 2008 09:22:17 -0000      1.3.2.2
+++ DeleteSecondaryContentAction.java   14 Apr 2008 13:11:03 -0000      1.3.2.3
@@ -22,7 +22,6 @@
                DeleteSecondaryContentForm deleteForm = 
(DeleteSecondaryContentForm) form;
                
                String number = deleteForm.getObjectnumber();
-               
if(MMBaseAction.SITEADMIN.equals(cloud.getUser().getRank().toString())) {
             try {
                                log.debug("deleting secondary content: 
"+number);
                 Node objectNode = cloud.getNode(number);
@@ -34,13 +33,13 @@
             } catch (NotFoundException nfe) {
                 log.info("Failed to delete secondaryContent with number " + 
number + ", node not found");
             }
-               }
-               else {
-                       log.warn("did not delete secondary content because user 
was not administrator: "+number+" 
("+cloud.getUser()+":"+cloud.getUser().getRank()+")");
-               }
                
                String returnurl = deleteForm.getReturnurl();
                return new ActionForward(returnurl);
        }
 
+       public String getRequiredRankStr() {
+           return MMBaseAction.SITEADMIN;
+       }
+       
 }
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to