diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/user_controller.rb | 10 | ||||
| -rw-r--r-- | app/views/user/wall.rhtml | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 72e9f63f1..ef013ad1e 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -119,11 +119,11 @@ class UserController < ApplicationController # All tracks for the user if @is_you @track_things = TrackThing.find(:all, :conditions => ["tracking_user_id = ? and track_medium = ?", @display_user.id, 'email_daily'], :order => 'created_at desc') - end - for track_thing in @track_things - # XXX factor out of track_mailer.rb - xapian_object = InfoRequest.full_search([InfoRequestEvent], track_thing.track_query, 'described_at', true, nil, 20, 1) - feed_results += xapian_object.results.map {|x| x[:model]} + for track_thing in @track_things + # XXX factor out of track_mailer.rb + xapian_object = InfoRequest.full_search([InfoRequestEvent], track_thing.track_query, 'described_at', true, nil, 20, 1) + feed_results += xapian_object.results.map {|x| x[:model]} + end end @feed_results = Array(feed_results).sort {|x,y| y.created_at <=> x.created_at}.first(20) diff --git a/app/views/user/wall.rhtml b/app/views/user/wall.rhtml index dd45250bd..190cc0a6d 100644 --- a/app/views/user/wall.rhtml +++ b/app/views/user/wall.rhtml @@ -1,10 +1,10 @@ <% @title = h(@display_user.name) + _(" - wall") %> - +<% if @is_you %> <div class="medium_column"> <p><%= _('You can change the requests and users you are following on <a href="{{profile_url}}">your profile page</a>.', :profile_url => show_user_profile_path) %> <%= render :partial => 'change_receive_email' %> </div> - +<% end %> <div id="user_profile_search"> <% if !@feed_results.nil? %> <% for result in @feed_results %> |