[Bedework-commit] webapps r353 - trunk/webcommon/src/org/bedework/webcommon/event

[svnadmin at bedework.org]

Author: douglm
Date: 2007-04-09 21:42:58 -0400 (Mon, 09 Apr 2007)
New Revision: 353

Modified:
   trunk/webcommon/src/org/bedework/webcommon/event/DeleteEventAction.java
Log:
Fix deletions in the admin client. We were trying to do the same as personal events.

In addition we need to delete annotations when we delete events. This is possibly incomplete.

We could try setting the master to null but we need to watch for that in display and retrieval.

Also we were not checking for unbind access during delete. Fixed.

Modified: trunk/webcommon/src/org/bedework/webcommon/event/DeleteEventAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/DeleteEventAction.java	2007-04-05 20:13:41 UTC (rev 352)
+++ trunk/webcommon/src/org/bedework/webcommon/event/DeleteEventAction.java	2007-04-10 01:42:58 UTC (rev 353)
@@ -74,7 +74,7 @@
 
     BwEvent ev = ei.getEvent();
 
-    if (request.present("remove") || !ev.getTrashable()) {
+    if (getPublicAdmin(form) || request.present("remove") || !ev.getTrashable()) {
       // Really delete
       // XXX What about synch?