diff --git a/app/controllers/admin/activities_controller.rb b/app/controllers/admin/activities_controller.rb index 5da8ae8..a43178e 100644 --- a/app/controllers/admin/activities_controller.rb +++ b/app/controllers/admin/activities_controller.rb @@ -2,7 +2,7 @@ class Admin::ActivitiesController < OrbitMemberController layout "member_plugin" #include Admin::PersonalActivitiesHelper - before_action :set_activity, only: [:edit, :update] + before_action :set_activity, only: [:edit, :update, :destroy] #before_action :set_plugin #before_action :need_access_right @@ -41,6 +41,15 @@ class Admin::ActivitiesController < OrbitMemberController redirect_to params['referer_url'] end + def destroy + @activity.destroy + respond_to do |format| + format.html { redirect_to(admin_activities_url) } + format.js + format.json { render json: { "success" => true } } + end + end + private def set_activity diff --git a/app/views/admin/activities/destroy.js.erb b/app/views/admin/activities/destroy.js.erb new file mode 100644 index 0000000..8e8536e --- /dev/null +++ b/app/views/admin/activities/destroy.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id @activity %>").remove();