Fixed 'delete event' feature.

docs/Changes

@@ -5,6 +5,9 @@ This file vaguely documents the revision history for ShinyCMS.  Newest items
 are at the top.
 
 
+2010-09-25
+	- Deleting events now works.
+
 2010-09-21
 	- Added contact email field to events.
 

docs/Features

@@ -98,8 +98,7 @@ version of ShinyCMS.
 		* Link to external event website
 		* Link to external ticket-booking website
 		* Link to Google Map for event location
-	* Add new events
-	* Edit existing events
+	* Add/Edit/Delete events
 	* Supply search results to site-wide search
 
 * Shop

docs/TODO

@@ -103,7 +103,8 @@ future (short or long term).
 		- Provide 'add to GCal' link
 		- Provide 'add to iCal' link
 		- Provide 'add to Outlook' link
-	- Delete event
+	* Add/edit events
+		- Add event to Facebook via API
 	- Recurring events
 	- Per event mailing lists??
 

lib/ShinyCMS/Controller/Events.pm

@@ -181,7 +181,7 @@ List all events for the back-end
 sub list_events : Chained( 'base' ) : PathPart( 'list' ) : Args( 0 ) {
 	my ( $self, $c ) = @_;
 
-	my $events = $self->admin_get_events( $c, 100 );
+	my $events = $self->admin_get_events( $c, 50 );
 
 	$c->stash->{ events } = $events;
 }
@@ -294,6 +294,18 @@ sub edit_event_do : Chained( 'base' ) : PathPart( 'edit-event-do' ) : Args( 1 )
 	# Check user privs
 	die unless $c->user->has_role( 'Events Admin' );	# TODO
 
+	# Process deletions
+	if ( defined $c->request->params->{ delete } && $c->request->param( 'delete' ) eq 'Delete' ) {
+		$c->model( 'DB::Event' )->search({ id => $event_id })->delete;
+
+		# Shove a confirmation message into the flash
+		$c->flash->{ status_msg } = 'Event deleted';
+
+		# Bounce to the default page
+		$c->response->redirect( $c->uri_for( 'list' ) );
+		return;
+	}
+
 	my $start_date = $c->request->param( 'start_date' ) .' '. $c->request->param( 'start_time' );
 	my $end_date   = $c->request->param( 'end_date'   ) .' '. $c->request->param( 'end_time'   );
 

root/events/edit_event.tt

@@ -100,7 +100,7 @@ $(document).ready(
 	<p>
 		<input type="submit" value="Save"  /> 
 		<input type="reset"  value="Reset" /> 
-		<input name="delete" type="submit" value="Delete" />
+		<input name="delete"  type="submit" value="Delete" onclick="javascript:return confirm('Are you sure you want to delete this event?')" />
 	</p>
 </form>