From 3a5d146ef30ad64a0d7a76160a459a4d6fa4ccec Mon Sep 17 00:00:00 2001 From: Seth Call Date: Thu, 10 Jul 2014 11:38:17 -0500 Subject: [PATCH] * change can_delete to can_cancel, and don't cehck for start_at anymore --- ruby/lib/jam_ruby/models/music_session.rb | 4 ++-- web/app/controllers/api_music_sessions_controller.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 8ba3a62fd..47c8fe303 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -392,8 +392,8 @@ module JamRuby active_music_session && active_music_session.mount end - def can_delete? user - self.creator == user && self.started_at.nil? + def can_cancel? user + self.creator == user end def legal_policy_url diff --git a/web/app/controllers/api_music_sessions_controller.rb b/web/app/controllers/api_music_sessions_controller.rb index c485e04b7..ad7df710c 100644 --- a/web/app/controllers/api_music_sessions_controller.rb +++ b/web/app/controllers/api_music_sessions_controller.rb @@ -240,7 +240,7 @@ class ApiMusicSessionsController < ApiController def destroy begin music_session = MusicSession.find(params[:id]) - if music_session.can_delete? current_user + if music_session.can_cancel? current_user Notification.send_scheduled_session_cancelled music_session music_session.canceled = true music_session.save