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

拿掉了对人、问题、需求、项目的赞功能，去掉了一些使用这些功能的代码。

This commit is contained in:
william 2013-08-12 15:08:44 +08:00
parent cf9aa12727
commit be35324bbc
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -31,7 +31,7 @@ class UsersController < ApplicationController
accept_api_auth :index, :show, :create, :update, :destroy,:tag_save accept_api_auth :index, :show, :create, :update, :destroy,:tag_save
#william #william
before_filter :require_login,:only => :tag_save before_filter :need_login,:only => :tag_save
helper :sort helper :sort

4
app/helpers/application_helper.rb
View File

@ -1317,8 +1317,8 @@ module ApplicationHelper
# end # end
#added by william #added by william
def get_fans_num(user) def need_login
user.watcher_users.count redirect_to signin_path
end end
#end #end
end end

4
app/views/users/index.html.erb
View File

@ -88,7 +88,6 @@
<div class="autoscroll"> <div class="autoscroll">
<% for user in @users -%> <% for user in @users -%>
<div class="well"> <div class="well">
<%= content_tag "p", "#{format_date(user.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %> <%= content_tag "p", "#{format_date(user.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %>
<%= image_tag "/images/time_member.png", :class => "img_member_time"%> <%= image_tag "/images/time_member.png", :class => "img_member_time"%>
<!-- <%= get_avatar?(user) ? (link_to image_tag(avatar_image(user), :class => 'avatar'), user_path(user), :class => "avatar") : (link_to image_tag("/images/12_50.png", :class => 'avatar'), user_path(user), :class => "avatar") %> --> <!-- <%= get_avatar?(user) ? (link_to image_tag(avatar_image(user), :class => 'avatar'), user_path(user), :class => "avatar") : (link_to image_tag("/images/12_50.png", :class => 'avatar'), user_path(user), :class => "avatar") %> -->
@ -99,9 +98,8 @@
<div style="margin-top: 20px;margin-left:66px"> <div style="margin-top: 20px;margin-left:66px">
<%= l(:label_has_fans,:count=>user.watcher_users.count)%> <%= l(:label_has_fans,:count=>user.watcher_users.count)%>
<%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %> <%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
<%= l(:label_has_praisers,:count=>get_praise_num(user))%>
</div> </div>
<!--<%= content_tag "span", content_tag("p", user.firstname), :class => "clear avatar_name" %>-->
<div class="user-bottom"> <div class="user-bottom">
<% unless user.memberships.empty? %> <% unless user.memberships.empty? %>
<%= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %> <%= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %>