Merge conflicts

utkarshkukreti · Jun 4, 2011 · fb24172 · fb24172
2 parents 17367c8 + c3ac98b
commit fb24172
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/app/controllers/public_controller.rb b/app/controllers/public_controller.rb
@@ -50,7 +50,7 @@ def announcement
   end
 
   def map
-
+    @locations = User.alumni.locations
   end
 
   private

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -94,9 +94,8 @@ def self.random_password
   # Retrieves locations for all users as an array of arrays where the inner
   # array is in the form [latitude, longitude].
   def self.locations
-    self.select("latitude, longitude")
-      .where("latitude IS NOT NULL AND longitude IS NOT NULL")
-      .map { |u| [u.latitude, u.longitude] }
+    where("latitude IS NOT NULL AND longitude IS NOT NULL").
+      map { |u| [u.latitude, u.longitude] }
   end
 
   def access_level

diff --git a/app/views/public/map.html.haml b/app/views/public/map.html.haml
@@ -3,7 +3,7 @@
 
 :javascript
   $(function(){
-    UW.Maps.init(#{User.locations.to_json});
+    UW.Maps.init(#{@locations.to_json});
   });
 
 #map_canvas