From 77420bcb095dcf7b2323295804a4c60c0b4bc382 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Sat, 3 Nov 2012 13:45:08 -0400
Subject: [PATCH] made feedback and metamaps manual display conditional instead
 of hard coded so there's not errors on a blank database

---
 app/controllers/main_controller.rb     |   2 +-
 app/controllers/sessions_controller.rb |   9 +++++++--
 app/controllers/users_controller.rb    |   9 +++++++--
 app/views/layouts/application.html.erb |   2 +-
 config/.database.yml.swp               | Bin 12288 -> 0 bytes
 5 files changed, 16 insertions(+), 6 deletions(-)
 delete mode 100644 config/.database.yml.swp

diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
index fd44c546..a19e889b 100644
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -11,7 +11,7 @@ class MainController < ApplicationController
     @maps = Map.visibleToUser(@current, nil)
 	@map = @maps.sample
 	
-	@mapjson = @map.self_as_json(@current).html_safe
+	@mapjson = @map.self_as_json(@current).html_safe if @map
 	
 	respond_to do |format|
       format.html { respond_with(@map, @user) }
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 29e638ea..f463429c 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -23,9 +23,14 @@ class SessionsController < ApplicationController
     @user = User.new
 	
 	@connor = User.find(555629996)
-	@map = Map.find(5)
+	@map = Map.find(:first, 5)
 		
-    respond_with(@user, @session, location: user_map_url(@connor,@map)) do |format| 
+    if @map
+      respond_with(@user, @session, location: user_map_url(@connor,@map)) do |format| 
+      end
+    else
+      respond_with(@user, @session, location: root_url) do |format| 
+      end
     end
   end
   
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 821e3643..cd46ebd4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -40,9 +40,14 @@ class UsersController < ApplicationController
 	
 	# direct them straight to the metamaps manual map. 
 	@connor = User.find(555629996)
-	@map = Map.find(5)
+	@map = Map.find(:first, 5)
         
-    respond_with(@user, location: user_map_url(@connor,@map)) do |format|
+    if @map
+      respond_with(@user, location: user_map_url(@connor,@map)) do |format|
+      end
+    else
+      respond_with(@user, location: root_url) do |format|
+      end
     end
   end
   
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6fd8a97a..dc3a1260 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -65,7 +65,7 @@
 		</div>
 			
     <div class="footer">
-      <% unless Map.find(:all, 7).empty? %>
+      <% unless Map.find(:first, 7).nil? %>
         <div class="feedback"><%= link_to "Feedback", user_map_path(User.find(555629996), Map.find(7)) %></div>
       <% end %>
 	  <div class="legend">
diff --git a/config/.database.yml.swp b/config/.database.yml.swp
deleted file mode 100644
index 35515eaabb0bdb2a67ca011f67f1c131c50a5343..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2Pm9w)7>B2xJh-~(UB)hY>z}0S)`nfNu%fGUEfw`xrpcJ5X=c*Qq@^PI5d=ZR
zqZdDb3SPX4;L(dG@l$y9;IE|xU8L$w*>}Rjo0-XEW}Z2PyuIq}y%w*RYYb(bv6tIV
z+GoGLD_q)OY*&sWHEaJ(X+~M3%0umo;mRi;%wJg9)qb8xWlbfFY(MW+5@|&u(rzeK
zwdz)Ut?ou)B@kBhgpuWGvih|v=cG<DKn9iu)>zGTs<YZg@eDt8^47A0A{ih9WPl8i
z0Wv@a$N(821BbwXO$+QH_IYHnSH6ga194HMKnBPF86X2>fDDiUGC&5%02v?yWPl9(
zhXzEz*qdXF-CV=s@&BJM_VD!tW1qo$@Cv*DkAVgfw80M823z1XI0`-;XY2!b4W5BV
zz=G@G8n_6~fpzc&bAAMG!E^8w+y}F@bO04HKnBPF86X2>fDDiUGC&5%z&~z)^Hdl!
z(OKZ}q8iBdmfvb#xIAbz^7v}pFtv`n5lrhv#(8dJrbHq=J{qNd9E<+c>hWZZu2k!x
z$Is(#nF#IiAn-Hg4#TuRh#N7wr1EtTsnFxOif}9E12c<(n>81ezBZ^x-z_=SddYR>
z!D(!keVwGal_jT))a!d%iHVuDVTcGsYGvkO1;&P%G@~I}lSp+FX^aS^@%Wu)XMb=1
z3QIE`<i3rx^6=?+c=l~2v>w=T&2ikH&vYqpX66^Cxk!6Q%6m7EV>#66EGr%l|KX`R
SZoOQ^<zUF)9NG_)dF(q;@)X1X