Fix unscoped issue

itkpi · Jul 23, 2017 · 70852d1 · 70852d1
1 parent a6865be
commit 70852d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/room_activities_controller.rb b/app/controllers/room_activities_controller.rb
@@ -3,7 +3,7 @@ class RoomActivitiesController < ApplicationController
   before_action :require_room_presence
 
   def new
-    @room_activities = @room.room_activities.unscoped
+    @room_activities = @room.room_activities_with_disabled
   end
 
   def create

diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
@@ -24,7 +24,7 @@ def create
   end
 
   def edit
-    @room_activities = @room.room_activities.unscoped
+    @room_activities = @room.room_activities_with_disabled
   end
 
   def update

diff --git a/app/models/room.rb b/app/models/room.rb
@@ -11,6 +11,10 @@ def activities
     Activity.where(room_activity_id: room_activity_ids)
   end
 
+  def room_activities_with_disabled
+    RoomActivity.where(room_id: id)
+  end
+
   def create_default_room_activities
     RoomActivity::DEFAULT_ROOM_ACTIVITIES.map do |activity_name|
       room_activities.create(name: activity_name)