diff --git a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb index 9afebd965..c399f4e24 100644 --- a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb +++ b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb @@ -79,8 +79,8 @@ end end - def new_musicians(user, new_nearby) - @user, @new_nearby = user, new_nearby + def new_musicians(user, new_nearby, host='www.jamkazam.com') + @user, @new_nearby, @host = user, new_nearby, host sendgrid_unique_args :type => "new_musicians" mail(:to => user.email, :subject => "JamKazam New Musicians in Your Area") do |format| format.text diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb index 104eaab6e..12d366f63 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb @@ -1,5 +1,23 @@ -<% provide(:title, 'Confirm Email') %> +<% provide(:title, 'New JamKazam Musicians in your Area') %>

New JamKazam Musicians in your Area, <%= @user.first_name %>!

- -

+<% link_style = "background-color:#ED3618; margin:0px 8px 0px 8px; border: solid 1px #F27861; outline: solid 2px #ED3618; padding:3px 10px; font-family:raleway; font-size:12px; font-weight:300; cursor:pointer; color:#FC9; text-decoration:none;" %> +

+ +<% @new_nearby.each do |user| %> + + + + + + +<% end %> +
<%= user.name %>
+ <%= user.location %>

+ <% user.musician_instruments.each do |inst| %> + + <% end %> +
<%= user.biography %>

+Profile   +
+

diff --git a/ruby/lib/jam_ruby/models/search.rb b/ruby/lib/jam_ruby/models/search.rb index 8ee7ea767..f6e6cca60 100644 --- a/ruby/lib/jam_ruby/models/search.rb +++ b/ruby/lib/jam_ruby/models/search.rb @@ -257,7 +257,8 @@ module JamRuby .within(radius, :origin => [usr.lat, usr.lng]) .order('created_at DESC') .limit(max_count) - yield(rel) if 0 < rel.count + objs = rel.all.to_a + yield(objs) if 0 < objs.count end end diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index 5a4d7debc..c212e96c9 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -993,7 +993,7 @@ module JamRuby def self.deliver_new_musician_notifications self.geocoded_users.find_each do |usr| Search.new_musicians(usr) do |new_nearby| - UserMailer.password_changed(self, new_nearby).deliver + UserMailer.new_musicians(self, new_nearby).deliver end end end