Fixing destroy learning objects in bookmarks

app/assets/javascripts/application/collections.coffee

@@ -99,7 +99,8 @@ $(document).on 'add_collection_selector', (e) ->
 $(document).on 'click', '.collection-selector', ->
   if this.checked
     if selected_objects.indexOf(this.value) < 0
-      selected_objects.push this.value
+      selected_objects.push { "class" : $(this).attr('data-type'), "value" : this.value}
+      console.log(selected_objects)
       $(document).trigger('check_selected_collection')
     return
   else
@@ -114,8 +115,7 @@ $(document).on 'mark_all_collections', ->
   selected_objects = []
   $('.collection-selector').prop('checked', true)
   $('.collection-selector').each () ->
-    console.log(this)
-    selected_objects.push { "class" : this.data, "value" : this.value}
+    selected_objects.push { "class" : $(this).attr('data-type'), "value" : this.value}
     console.log(selected_objects)
   $(document).trigger('check_selected_collection')
 
@@ -136,14 +136,29 @@ $(document).on 'clear_collections', ->
 $(document).on 'click', '.collection-button', ->
   collection = $('.collection-show-page').data('cid')
   index = permitted_types.indexOf($(this).data('action'))
+  urls = []
+  los = []
   if permitted_types[index] == 'remove'
-    url = '/collections/' + encodeURIComponent(collection) + '/learning_objects/' + encodeURIComponent(selected_objects.join())
+    if ($('.collection-button').data('class') == 'collections')
+      i = 0
+      while i < selected_objects.length
+        los.push selected_objects[i]["value"]
+        i++
+      urls.push '/collections/' + encodeURIComponent(collection) + '/learning_objects/' + encodeURIComponent(los.join(','))
+    else
+      i = 0
+      while i < selected_objects.length
+        urls.push '/bookmarks/' + encodeURIComponent(selected_objects[i]["class"]) + '/' + encodeURIComponent(selected_objects[i]["value"])
+        i++
     if confirm('Você tem certeza?')
-      $.ajax { method: 'DELETE', url: url }
-      .done ->
-        $(document).trigger 'refresh_comments'
-  else
-    $(document).trigger('open_collections_modal', [collection: collection, type: permitted_types[index], learning_object: selected_objects ]) if !!(~index)
+      i = 0
+      while i < urls.length
+        $.ajax { method: 'DELETE', url: urls[i] }
+        .done ->
+          $(document).trigger 'refresh_comments'
+        i++
+    else
+      $(document).trigger('open_collections_modal', [collection: collection, type: permitted_types[index], learning_object: selected_objects ]) if !!(~index)
 
 # refresh comments via ajax
 $(document).on 'refresh_comments', (e) ->

app/controllers/bookmarks_controller.rb

@@ -9,6 +9,7 @@ class BookmarksController < ApplicationController
   # GET /bookmarks/1
   # GET /bookmarks/1.json
   def show
+    render partial: 'list' if params[:list] == 'true'
   end
 
   # POST /bookmarks/1/learning_object
@@ -19,10 +20,14 @@ class BookmarksController < ApplicationController
     render json: { status: true } if request.xhr?
   end
 
+  def list
+    render layout: false
+  end
+
   # DELETE /bookmarks/1/learning_object
   def remove_object
     authorize @object
-    Bookmark.destroy(user: @user, bookmarkable: @object)
+    Bookmark.destroy Bookmark.where(user: @user, bookmarkable: @object)
 
     render json: { status: true } if request.xhr?
   end

app/views/bookmarks/_list.html.erb

+<% @user.bookmark_learning_objects.each do |object| %>
+  <%= render object, orientation: 'vertical' %>
+<% end %>

app/views/bookmarks/show.html.erb

@@ -39,11 +39,9 @@
   </div>
 </nav>
 
-<div class= "row">
+<div class="row">
   <div class="learning-object-columns">
     <br/>
-    <% @user.bookmark_learning_objects.each do |object| %>
-      <%= render object, orientation: 'vertical' %>
-    <% end %>
+    <%= render partial: 'list' %>
   </div>
 </div>

app/views/collections/show.html.erb

@@ -39,22 +39,22 @@
   <div class="container-fluid">
     <a class="navbar-brand"  data-toggle="tooltip" data-placement="bottom" ></a>
     <ul class="nav navbar-nav navbar-right">
-      <li class="set-align collection-button" data-action="download">
+      <li class="set-align collection-button" data-action="download" data-class="collections">
         <a href="javascript:void(0);"><span class="left-edge1"><%= image_tag image_path("icons/Download_01.png"), class: "logo-image", size: "35x35" %></span><span style="color: white">
           Salvar no <br>computador</span></a>
       </li>
       <% if user_signed_in? %>
-      <li class="set-align collection-button" data-action="copy">
+      <li class="set-align collection-button" data-action="copy" data-class="collections">
         <a href="javascript:void(0);"><span class="left-edge1"><%= image_tag image_path("icons/Copiar_Seleção.png"), class: "logo-image", size: "35x35" %></span><span style="color: white">
           Copiar <br>para</span></a>
       </li>
       <% end %>
       <% if @own %>
-        <li class="set-align collection-button" data-action="move">
+        <li class="set-align collection-button" data-action="move" data-class="collections">
           <a href="javascript:void(0);"><span class="left-edge1"><%= image_tag image_path("icons/Mover_Seleção.png"), class: "logo-image", size: "35x35" %></span><span style="color: white">
             Mover <br>para</span></a>
         </li>
-        <li class="set-align collection-button" data-action="remove">
+        <li class="set-align collection-button" data-action="remove" data-class="collections">
           <a href="javascript:void(0);"><span class="left-edge1"><%= image_tag image_path("icons/Remover_da_Coleção_Seleção.png"), class: "logo-image", size: "35x35" %></span><span style="color: white">
             Remover da <br>coleção</span></a>
         </li>

config/routes.rb

@@ -110,8 +110,9 @@ Rails.application.routes.draw do
   end
 
   get '/bookmarks' => 'bookmarks#show', as: 'bookmark'
+  get '/bookmarks/list' => 'bookmarks#list', as: 'list'
   post '/bookmarks/:type/:id' => 'bookmarks#add_object', as: :bookmark_add
-  delete '/bookmarks/' => 'bookmarks#remove_object', as: :bookmark_remove
+  delete '/bookmarks/:type/:id' => 'bookmarks#remove_object', as: :bookmark_remove
 
   get '/users/verify_email' => 'users#verify_email', as: :verify_email
   get '/users/list' => 'users#list', as: :list_all_users