jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
Administrator 2013-08-19 17:07:32 +08:00
parent 02239e8cd2 a126083579
commit dc83d2e7e9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/application_helper.rb
View File

@ -1311,6 +1311,9 @@ module ApplicationHelper
def show_watcher_profile(obj) def show_watcher_profile(obj)
count = 0 count = 0
html = '' html = ''
if User.watched_by(obj.id).count == 0
html << (content_tag "span", l(:label_no_current_watchers))
end
for user in User.watched_by(obj.id) for user in User.watched_by(obj.id)
html << (link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar", :title => "#{user.name}") html << (link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar", :title => "#{user.name}")
count = count + 1 count = count + 1
@ -1333,6 +1336,9 @@ module ApplicationHelper
def show_fans_picture(obj) def show_fans_picture(obj)
html = '' html = ''
count = 0 count = 0
if obj.watcher_users.count == 0
html << (content_tag "span", l(:label_no_current_fans))
end
for user in obj.watcher_users for user in obj.watcher_users
html << (link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar", :title => "#{user.name}") html << (link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar", :title => "#{user.name}")
count = count + 1 count = count + 1