Ability to remvoe broadcast messages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

4 files changed, 22 insertions, 2 deletions

diff --git a/app/assets/stylesheets/sections/admin.scss b/app/assets/stylesheets/sections/admin.scss
index e189fd27ac6..82556e91da3 100644
--- a/app/assets/stylesheets/sections/admin.scss
+++ b/app/assets/stylesheets/sections/admin.scss
@@ -21,3 +21,9 @@
   .controls { margin-left: 130px; }
   .form-actions { padding-left: 130px; background: #fff }
 }
+
+.broadcast-messages {
+  .message {
+    line-height: 2;
+  }
+}
diff --git a/app/controllers/admin/broadcast_messages_controller.rb b/app/controllers/admin/broadcast_messages_controller.rb
index 3ba8d09bc8c..9a70ef9d199 100644
--- a/app/controllers/admin/broadcast_messages_controller.rb
+++ b/app/controllers/admin/broadcast_messages_controller.rb
@@ -15,6 +15,15 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
     end
   end
 
+  def destroy
+    BroadcastMessage.find(params[:id]).destroy
+
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.js { render nothing: true }
+    end
+  end
+
   protected
 
   def broadcast_messages
diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml
index 22f7b71912c..fc750a4be77 100644
--- a/app/views/admin/broadcast_messages/index.html.haml
+++ b/app/views/admin/broadcast_messages/index.html.haml
@@ -25,7 +25,7 @@
     = f.submit "Add broadcast message", class: "btn btn-create"
 
 -if @broadcast_messages.any?
-  %ul.bordered-list
+  %ul.bordered-list.broadcast-messages
     - @broadcast_messages.each do |broadcast_message|
       %li
         .pull-right
@@ -36,6 +36,11 @@
           - if broadcast_message.ends_at
             %strong
               #{broadcast_message.ends_at.to_s(:short)}
+          &nbsp;
+          = link_to [:admin, broadcast_message], method: :delete, remote: true, class: 'remove-row btn btn-tiny' do
+            %i.icon-remove.cred
+
         .message= broadcast_message.message
 
+
   = paginate @broadcast_messages
diff --git a/config/routes.rb b/config/routes.rb
index d41a07872e4..3b69239087c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -86,7 +86,7 @@ Gitlab::Application.routes.draw do
       get :test
     end
 
-    resources :broadcast_messages, only: [:index, :create]
+    resources :broadcast_messages, only: [:index, :create, :destroy]
     resource :logs, only: [:show]
     resource :background_jobs, controller: 'background_jobs', only: [:show]
     resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show]