diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-12-31 17:55:14 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-13 11:42:15 -0500 |
commit | 00e8700433b3b1ad11252448af5be58913539d85 (patch) | |
tree | b506bc61c351ecbfa3a0c4c468911cf6374b1ba3 /app/controllers/admin | |
parent | 540ae3c3658d051f852b2c10fa61c557521196e1 (diff) | |
download | gitlab-ce-00e8700433b3b1ad11252448af5be58913539d85.tar.gz |
Broadcast Messages can now be edited
Closes #3046
Diffstat (limited to 'app/controllers/admin')
-rw-r--r-- | app/controllers/admin/broadcast_messages_controller.rb | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/app/controllers/admin/broadcast_messages_controller.rb b/app/controllers/admin/broadcast_messages_controller.rb index bc702c022b6..4735b27c65d 100644 --- a/app/controllers/admin/broadcast_messages_controller.rb +++ b/app/controllers/admin/broadcast_messages_controller.rb @@ -1,8 +1,12 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController - before_action :broadcast_messages + before_action :finder, only: [:edit, :update, :destroy] def index - @broadcast_message = BroadcastMessage.new + @broadcast_messages = BroadcastMessage.reorder("starts_at ASC").page(params[:page]) + @broadcast_message = BroadcastMessage.new + end + + def edit end def create @@ -15,8 +19,16 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController end end + def update + if @broadcast_message.update(broadcast_message_params) + redirect_to admin_broadcast_messages_path, notice: 'Broadcast Message was successfully updated.' + else + render :edit + end + end + def destroy - BroadcastMessage.find(params[:id]).destroy + @broadcast_message.destroy respond_to do |format| format.html { redirect_back_or_default(default: { action: 'index' }) } @@ -26,8 +38,8 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController protected - def broadcast_messages - @broadcast_messages ||= BroadcastMessage.order("starts_at DESC").page(params[:page]) + def finder + @broadcast_message = BroadcastMessage.find(params[:id]) end def broadcast_message_params |