Merge branch 'develop'

diegosteiner · Dec 3, 2023 · b3bb091 · b3bb091
2 parents 570eb4c + 11994e8
commit b3bb091
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/controllers/manage/notifications_controller.rb b/app/controllers/manage/notifications_controller.rb
@@ -7,7 +7,8 @@ class NotificationsController < BaseController
     before_action :set_booking, only: %i[show]
 
     def index
-      @notifications = @notifications.order(created_at: :DESC)
+      @notifications = @notifications.joins(:booking).where(booking: { organisation: current_organisation })
+                                     .order(created_at: :DESC)
       @notifications = @notifications.unsent if @booking.blank?
       respond_with :manage, @notifications
     end