diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb
index 7b2eda2..7646ffe 100644
--- a/app/controllers/admin/announcements_controller.rb
+++ b/app/controllers/admin/announcements_controller.rb
@@ -426,7 +426,11 @@ class Admin::AnnouncementsController < OrbitAdminController
Bulletin.notify_feed_delete(params[:ids])
end
end
- redirect_to admin_announcements_path
+ if request.xhr?
+ render :nothing => true, :status => 204
+ else
+ redirect_to admin_announcements_path
+ end
end
def preview
diff --git a/app/views/admin/announcements/_index.html.erb b/app/views/admin/announcements/_index.html.erb
index 0f684a2..80c80ea 100644
--- a/app/views/admin/announcements/_index.html.erb
+++ b/app/views/admin/announcements/_index.html.erb
@@ -1,10 +1,96 @@
<% @bulletins.each do |b| %>
+ <% is_editable = can_edit_or_delete?(b) %>
+ | <% if is_editable %><% end %> |
<%= b.status_for_table %>
|
@@ -50,7 +138,7 @@
- ').slideToggle(300); return false;"><%= t(:detail) %>
- <% if can_edit_or_delete?(b) %>
+ <% if is_editable %>
- <%= t(:edit) %>
- <%= t(:delete_) %>
<% end %>
@@ -99,6 +187,7 @@
<%=
content_tag :div, class: "bottomnav clearfix" do
content_tag(:div, paginate(@bulletins), class: "pagination pagination-centered") +
+ content_tag(:div, link_to(t("archive.delete_selected"), "javascript:void(0)", :class=>"btn btn-primary"), class: "pull-right hide delete_archives_btn") +
content_tag(:div, link_to(t(:new_),new_admin_announcement_path, :class=>"btn btn-primary"), class: "pull-right")
end
%>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 7db311b..61007aa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,6 +32,7 @@ Rails.application.routes.draw do
patch 'announcement/updatesettings', to: 'announcements#updatesettings'
post 'announcement/import_from_wp', to: 'announcements#import_from_wp'
post 'announcement/generate_iframe_url' => 'announcements#generate_iframe_url'
+ delete 'announcement/delete', to: 'announcements#delete'
resources :announcements
get 'announcements/:id/comment'=> 'announcements#comment'
get 'annc-comment-hidden/:id' => 'announcements#comment_hidden'