Calendar Admin check on destroy; fixed destroy

app/controllers/calendar_events_controller.rb

@@ -72,8 +72,11 @@ def create
   def update
     @calendar_event = CalendarEvent.get(params[:id])
     if params[:start_date] && params[:end_date]
-      params[:calendar_event][:start] = params[:start_date] + ' ' + params[:start_time]
-      params[:calendar_event][:end] = params[:end_date] + ' ' + params[:end_time]
+      params[:calendar_event][:start] = Time.zone.parse(params[:start_date] + ' ' + params[:start_time])
+      params[:calendar_event][:end] = Time.zone.parse(params[:end_date] + ' ' + params[:end_time])
+    else
+      params[:calendar_event][:start] = Time.zone.parse(params[:calendar_event][:start])
+      params[:calendar_event][:end] = Time.zone.parse(params[:calendar_event][:end])
     end
 
 
@@ -94,7 +97,7 @@ def update
   # DELETE /calendar_events/1.xml
   def destroy
     @calendar_event = CalendarEvent.get(params[:id])
-    @calendar_event.destroy
+    @calendar_event.destroy if current_user == @calendar_event.user || current_user.calendar_admin?
 
     respond_to do |format|
       format.html { redirect_to(calendar_events_url) }

app/models/calendar_event.rb

@@ -19,7 +19,7 @@ class CalendarEvent
   property :deleted_at, ParanoidDateTime
 
   belongs_to :user
-  has n, :subscriptions
+  has n, :subscriptions, :constraint => :destroy!
 
   #validates_length_of :comment, :min => 15
 

app/views/administration/users/_form.html.haml

@@ -30,5 +30,8 @@
   .field
     = f.check_box :ex_member
     = f.label :ex_member
+  .field
+    = f.check_box :calendar_admin
+    = f.label :calendar_admin
   .actions
     = f.submit

app/views/administration/users/show.html.haml

@@ -15,6 +15,8 @@
   = @user.role.name
 %p
   = @user.ex_member? ? "Ex-Member" : "No Ex-Member"
+%p
+  = @user.calendar_admin? ? "Calendar Admin" : "No Calendar Admin"
 = link_to 'Edit', edit_administration_user_path(@user)
 |
 \#{link_to 'Back', administration_users_path}