Add specs for places and candidates.

sozialhelden · Mar 18, 2014 · f6af4f2 · f6af4f2
1 parent 501806d
commit f6af4f2
Show file tree

Hide file tree

Showing 5 changed files with 1,130 additions and 6 deletions.
diff --git a/app/admin/candidate.rb b/app/admin/candidate.rb
@@ -36,8 +36,8 @@ def create
     private
 
     def resource
-      @candidate = Candidate.find(params[:id], params[:osm_type]) if params[:id]
-      @candidate ||= Candidate.new(@place.attributes)
+      @candidate = Candidate.find(params[:id], params[:osm_type] || 'node') if params[:id]
+      @candidate ||= Candidate.new(parent.attributes)
     end
 
     def parent

diff --git a/app/admin/place.rb b/app/admin/place.rb
@@ -27,7 +27,11 @@
   end
 
   collection_action :next, title: false do
-    redirect_to admin_place_path(collection.first)
+    if collection.first
+      redirect_to admin_place_path(collection.first)
+    else
+      redirect_to admin_places_path, notice: "Das war der letzte Ort."
+    end
   end
 
   collection_action :upload_csv, title: "Upload Dataset" do