diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
commit | db384e6b19af03b4c3c82a5760d83a3fd79f7982 (patch) | |
tree | 34beaef37df5f47ccbcf5729d7583aae093cffa0 /app/controllers/admin/broadcast_messages_controller.rb | |
parent | 54fd7b1bad233e3944434da91d257fa7f63c3996 (diff) |
Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42
Diffstat (limited to 'app/controllers/admin/broadcast_messages_controller.rb')
-rw-r--r-- | app/controllers/admin/broadcast_messages_controller.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/admin/broadcast_messages_controller.rb b/app/controllers/admin/broadcast_messages_controller.rb index 7f85103816e..06ee178599d 100644 --- a/app/controllers/admin/broadcast_messages_controller.rb +++ b/app/controllers/admin/broadcast_messages_controller.rb @@ -2,7 +2,7 @@ module Admin class BroadcastMessagesController < ApplicationController - include BroadcastMessagesHelper + include Admin::BroadcastMessagesHelper before_action :find_broadcast_message, only: [:edit, :update, :destroy] before_action :find_broadcast_messages, only: [:index, :create] @@ -11,13 +11,13 @@ module Admin urgency :low def index - @broadcast_message = BroadcastMessage.new + @broadcast_message = System::BroadcastMessage.new end def edit; end def create - @broadcast_message = BroadcastMessage.new(broadcast_message_params) + @broadcast_message = System::BroadcastMessage.new(broadcast_message_params) success = @broadcast_message.save respond_to do |format| @@ -69,18 +69,18 @@ module Admin end def preview - @broadcast_message = BroadcastMessage.new(broadcast_message_params) + @broadcast_message = System::BroadcastMessage.new(broadcast_message_params) render plain: render_broadcast_message(@broadcast_message), status: :ok end protected def find_broadcast_message - @broadcast_message = BroadcastMessage.find(params[:id]) + @broadcast_message = System::BroadcastMessage.find(params[:id]) end def find_broadcast_messages - @broadcast_messages = BroadcastMessage.order(ends_at: :desc).page(params[:page]) # rubocop: disable CodeReuse/ActiveRecord + @broadcast_messages = System::BroadcastMessage.order(ends_at: :desc).page(params[:page]) # rubocop: disable CodeReuse/ActiveRecord end def broadcast_message_params |