Move delete checkboxes to js

app/assets/javascripts/sort_header.js

@@ -1,5 +1,14 @@
 $(document).on('click', '.list-remove', function(){
-	$('#delete_all').submit();
+	var a = [];
+	$('.checkbox_in_list').each(function(){
+    if (this.checked) a.push("ids[]=" + this.value);
+	});
+	var url = $(this).attr('rel');
+	if (url.indexOf('?') > -1){
+		$.getScript(url + '&' + a.join('&'));
+	}else{
+		$.getScript(url + '?' + a.join('&'));
+	}
 });
 
 $(document).on('click', '#check_all', function(){

app/controllers/admin/assets_controller.rb

@@ -87,8 +87,8 @@ class Admin::AssetsController < OrbitBackendController
   end
 
   def delete
-    if params[:to_delete]
-      asset = Asset.any_in(:_id => params[:to_delete]).delete_all
+    if params[:ids]
+      asset = Asset.any_in(:_id => params[:ids]).delete_all
     end
     redirect_to assets_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end

app/controllers/admin/designs_controller.rb

@@ -86,8 +86,8 @@ class Admin::DesignsController < OrbitBackendController
   end
 
   def delete
-    if params[:to_delete]
-      designs = Design.any_in(:_id => params[:to_delete]).delete_all
+    if params[:ids]
+      designs = Design.any_in(:_id => params[:ids]).delete_all
     end
     redirect_to admin_designs_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end

app/helpers/orbit_backend_helper.rb

@@ -20,13 +20,13 @@ module OrbitBackendHelper
     ' active' if (@filter[type].include?(id.to_s) rescue nil)
   end
 
-  def render_sort_bar(delete_all, *titles)
+  def render_sort_bar(delete_all, url, *titles)
     content_tag :table, :class => "table main-list" do
       content_tag :thead do
         content_tag :tr, :class => "sort-header" do
           concat (content_tag :th, :class => "span1 strong" do
             concat check_box_tag :check_all
-            concat link_to content_tag(:i, nil, :class => "icon-trash"), '#', :class => "list-remove"
+            concat link_to content_tag(:i, nil, :class => "icon-trash"), '#', :class => "list-remove", :rel => url
            end) if (delete_all && (is_admin? || (is_manager? rescue nil)))
           titles.each do |title|
             concat render_title(title[0], title[1], title[2], title[3])

app/views/admin/assets/_sort_headers.html.erb

@@ -1,4 +1,5 @@
-<%= render_sort_bar(true, ['title', 'title','span4', 'admin.title'],
+<%= render_sort_bar(true, delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]),
+ ['title', 'title','span4', 'admin.title'],
 													['description', 'description', 'span1-2', 'admin.data'],
 													['intro', 'intro', 'span1-2', 'admin.file_type'],
 													['intro', 'intro', 'span1-2', 'admin.file_length'],

app/views/admin/assets/index.html.erb

@@ -1,22 +1,20 @@
-<%= form_for :assets, :url => delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %>
-	<%= render 'filter' %>
-	<table id="asset_sort_list" class="table main-list">
-		<thead>
-			<tr>
-        <th class="span1"></th>
-        <th class="span4"></th>
-        <th class="span1-2"></th>
-        <th class="span1-2"></th>
-        <th class="span1-2"></th>
-        <th class="span1-2"></th>
-        <th class="span1-2"></th>
-			</tr>
-		</thead>
-		<tbody id="tbody_assets" class="sort-holder">
-			<%= render :partial => 'asset', :collection => @assets %>
-		</tbody>
-	</table>
-<% end %>
+<%= render 'filter' %>
+<table id="asset_sort_list" class="table main-list">
+	<thead>
+		<tr>
+      <th class="span1"></th>
+      <th class="span4"></th>
+      <th class="span1-2"></th>
+      <th class="span1-2"></th>
+      <th class="span1-2"></th>
+      <th class="span1-2"></th>
+      <th class="span1-2"></th>
+		</tr>
+	</thead>
+	<tbody id="tbody_assets" class="sort-holder">
+		<%= render :partial => 'asset', :collection => @assets %>
+	</tbody>
+</table>
 
 <div class="form-actions form-fixed pagination-right">
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_admin_asset_path, :remote => true, :class => 'btn btn-primary pull-right' %>

app/views/admin/designs/_sort_headers.html.erb

@@ -1,3 +1,4 @@
-<%= render_sort_bar(true, ['title', 'title','span7', 'admin.title'],
+<%= render_sort_bar(true, delete_admin_designs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
+ ['title', 'title','span7', 'admin.title'],
 													['author', 'author', 'span2', 'admin.author'],
 													['intro', 'intro', 'span2', 'admin.intro']).html_safe %>

app/views/admin/designs/index.html.erb

@@ -2,12 +2,10 @@
 	<%= render 'admin/sites/side_bar' %>
 <% end %>
 
-<%= form_for :news_bulletins, :url => delete_admin_designs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %>
-	<%= render 'filter' %>
-	<table class="table main-list">
-		<%= render 'designs' %>
-	</table>
-<% end %>
+<%= render 'filter' %>
+<table class="table main-list">
+	<%= render 'designs' %>
+</table>
 
 <div class="form-actions form-fixed pagination-right">
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_admin_design_path, :class => 'btn btn-primary' %>