fixed the merge conflicts

UFPE · Apr 27, 2015 · 8d84fff · 8d84fff
1 parent 2c6b5ff
commit 8d84fff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/app/views/collections/edit.html.haml b/app/views/collections/edit.html.haml
@@ -1,20 +1,9 @@
-<<<<<<< HEAD
+
 %h3= "Your collection: #{@collection.name}"
-=render :partial=> 'form', locals: {collection: @collection}
+=render :partial=> 'form', locals: {collection: @collection, :remote => false}
 %p.collectioncontrols
   =link_to "Delete Collection", collection_path(@collection), :class => 'btn btn-danger', method: :delete, :confirm => 'Delete this collection?'
 %p.collectioncontrols
   =link_to "Export Collection", export_path(:id => @collection), :class => 'btn btn-info'
 
 = render :partial => "shared/problems_table", locals: {problems_index: false, collection: @collection, problems: @collection.problems}
-=======
-%h3= "Your collection #{@collection.name}"
-=render :partial=> 'form', locals: {collection: @collection, remote: false}
-%p 
-  Delete this collection? 
-  =link_to 'trash_can_icon', collection_path(@collection), method: :delete, :confirm => 'Delete this collection?'
-%p 
-  Export this collection: 
-  =link_to 'export button', export_path(:id => @collection) 
-= render :partial => "shared/problems_table", locals: {problems_index: false, collection: @collection, problems: @collection.problems}
->>>>>>> d0ea43498e3f0a2e8de3fcb02232d15b7b51459a
diff --git a/app/views/collections/finalize_upload.html.haml b/app/views/collections/finalize_upload.html.haml
@@ -10,11 +10,11 @@
       %tbody
         -@collections.each do |collection|
           %tr
-            =render :partial=> 'form', locals: {collection: collection}
-            %p.collectioncontrols
-              =link_to(image_tag('trashcan.png', width: 21),  collection_path(@collection), method: :delete, :confirm => 'Delete this collection?')
-            %p.collectioncontrols
-
+            =render :partial=> 'form', locals: {collection: collection, :remote => true}
+            %p 
+              Delete this collection? 
+              =link_to 'trash_can_icon', collection_path(collection), method: :delete, :confirm => 'Delete this collection?'
+            %p 
               Export this collection: 
               =link_to 'export button', export_path(:id => collection) 
             = render :partial => "shared/problems_table", locals: {problems_index: false, collection: collection, problems: collection.problems}
diff --git a/app/views/collections/new.html.haml b/app/views/collections/new.html.haml
@@ -1,4 +1,4 @@
 %h2 Create New Collection
 
 
-= render "form", :collection => @collection
+= render "form", :collection => @collection, :remote => false