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

调整需求的评价，隐藏个人账户的首选项内容

This commit is contained in:
fanqiang 2013-10-14 10:09:10 +08:00
parent bcb66f2b32
commit 2fbf025c2f
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/user.rb
View File

@ -161,6 +161,18 @@ class User < Principal
false false
end end
end end
def show_name
unless self.user_extensions.nil?
if self.user_extensions.identity == 2
firstname
else
lastname+firstname
end
else
lastname+firstname
end
end
## end ## end
def count_new_jour def count_new_jour

2
app/views/bids/_list_projects.html.erb
View File

@ -19,7 +19,7 @@
<!-- 如果需求到期 并且是该需求的管理员 --> <!-- 如果需求到期 并且是该需求的管理员 -->
<td style="color: red;" align="right" valign="0.1em" width="35%"> <td style="color: red;" align="right" valign="0.1em" width="15%">
<strong><span id="reward_result_<%=b_project.id%>"> <strong><span id="reward_result_<%=b_project.id%>">
<% if get_prize(b_project).nil? or get_prize(b_project) == "" %> <% if get_prize(b_project).nil? or get_prize(b_project) == "" %>

9
app/views/bids/_project_list.html.erb
View File

@ -14,7 +14,7 @@
<% end %> <% end %>
</table> </table>
<% @bidding_project.each do |b_project|%> <!-- <% @bidding_project.each do |b_project|%>
<table width="90%" border="0" align='center'> <table width="90%" border="0" align='center'>
<tr> <tr>
<td> <td>
@ -55,7 +55,7 @@
</table></td> </table></td>
</tr> </tr>
</table> </table>
<% end %> <% end %> -->
<% else %> <% else %>
<table width="1000px" border="0" style="padding-left: 15px"> <table width="1000px" border="0" style="padding-left: 15px">
@ -68,7 +68,7 @@
<% end %> <% end %>
</table> </table>
<% @bidding_project.each do |b_project|%> <!-- <% @bidding_project.each do |b_project|%>
<table width="90%" border="0" align='center'> <table width="90%" border="0" align='center'>
<tr> <tr>
<td> <td>
@ -106,5 +106,6 @@
</table></td> </table></td>
</tr> </tr>
</table> </table>
<% end %> -->
<% end %> <% end %>
<% end %> <%= render :partial=> "list_projects",:locals => {:bidding_project => @bidding_project,:bid => @bid }%>

6
app/views/my/account.html.erb
View File

@ -483,13 +483,13 @@ $().ready(function(){
</p></div> </p></div>
</fieldset> </fieldset>
<fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;"> <!-- <fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
<legend onclick="toggleFieldset(this);"> <legend onclick="toggleFieldset(this);">
<%= l(:label_preferences)%> <%= l(:label_preferences)%>
</legend> </legend>
<div style="padding-left: 26px;"> <!-- modified by ming --> <div style="padding-left: 26px;">
<%= render :partial => 'users/preferences' %></div> <%= render :partial => 'users/preferences' %></div>
</fieldset> </fieldset> -->
<!-- added by william --> <!-- added by william -->
<fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;display: none"> <fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;display: none">
<legend onclick="toggleFieldset(this);"> <legend onclick="toggleFieldset(this);">