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

fix natural

This commit is contained in:
xianbo 2013-10-24 10:13:00 +08:00
parent 39580a04a2
commit 2fa6276829
4 changed files with 59 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/controllers/users_controller.rb
View File

@ -563,20 +563,20 @@ class UsersController < ApplicationController
end end
def watch_projects def watch_projects
@watch_type = Watcher.visible.where("watchable_type = ? and user_id = ?", 'Project', @user.id) @watch_type = Watcher.visible.where("watchable_type = ? and user_id = ?", 'Project', @user.id)
@watch_projects = [] @watch_projects = []
unless @watch_type.nil? unless @watch_type.nil?
@watch_type.each do |obj| @watch_type.each do |obj|
@watch_projects << Project.find(obj.watchable_id) if(Project.find(obj.watchable_id)) @watch_projects << Project.find(obj.watchable_id)
end end
end end
respond_to do |format| respond_to do |format|
format.html { format.html {
render :layout => 'base_users' render :layout => 'base_users'
} }
format.api format.api
end
end end
end
def update def update
@user.admin = params[:user][:admin] if params[:user][:admin] @user.admin = params[:user][:admin] if params[:user][:admin]

12
app/views/users/user_projects.html.erb
View File

@ -1,12 +1,12 @@
<!--add by huang--> <!--add by huang-->
<p>
<div class="content_frame"> <strong><%= l(:label_project_take)%>
<p><%= link_to "关注的项目" , {:controller => 'users', :action => 'watch_projects', :id => @user.id}%> <%= link_to l(:label_has_watched_project) , {:controller => 'users', :action => 'watch_projects', :id => @user.id}%></strong>
<% unless @memberships.empty? %> <% unless @memberships.empty? %>
<% if @user == User.current %> <% if @user == User.current %>
<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></p> <span style="margin-left: 300px"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></sapn></p>
<% end %> <% end %>
<div class="content_frame">
<ul class="user_project_sort"> <ul class="user_project_sort">
<% for membership in @memberships %> <% for membership in @memberships %>
<li> <li>
@ -17,7 +17,7 @@
<table width="580" border="0"> <table width="580" border="0">
<tr> <tr>
<td colspan="2" valign="top"><strong> <%= link_to_user(membership.user) if membership.respond_to?(:user) %></strong> <td colspan="2" valign="top"><strong> <%= link_to_user(membership.user) if membership.respond_to?(:user) %></strong>
<span class="font_lighter"> <%= l(:label_watch_project) %></span> <%= link_to_project(membership.project) %></td> <span class="font_lighter"> <%= l(:label_peoject_take_in) %></span> <%= link_to_project(membership.project) %></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" > <td colspan="2" width="580" >

61
app/views/users/watch_projects.html.erb
View File

@ -1,34 +1,39 @@
<p><%= link_to "关注的项目" , {:controller => 'users', :action => 'watch_projects', :id => @user.id}%> <table>
<% if @user == User.current %> <p><strong>
<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></p> <%= l(:label_has_watched_project)%>
<% end %> <%= link_to l(:label_project_take) , {:controller => 'users', :action => 'user_projects', :course => 0, :project_type => @project_type}%></strong>
<% if @user == User.current %>
<span style="margin-left: 300px"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></span>
<% end %>
</td>
</p>
<table>
<% unless @watch_projects.nil?&&watch_projects.project.nil? %> <% unless @watch_projects.nil?&&watch_projects.project.nil? %>
<% for watch_project in @watch_projects %> <% for watch_project in @watch_projects %>
<table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;"> <table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(watch_project.project), :class => 'avatar'), project_path(watch_project.project) %></td>
<td>
<table width="580" border="0">
<tr> <tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(watch_project.project), :class => 'avatar'), project_path(watch_project.project) %></td> <td colspan="2" valign="top"><strong> <%= link_to_user(@user) if watch_project.respond_to?(:user) %></strong><span class="font_lighter"> <%= @user.name%><%= l(:label_watch_project) %></span> <%= link_to_project(watch_project.project) %></td>
<td>
<table width="580" border="0">
<tr>
<td colspan="2" valign="top"><strong> <%= link_to_user(@user) if watch_project.respond_to?(:user) %></strong>
<span class="font_lighter"> <%= @user.name%><%= l(:label_watch_project) %></span> <%= link_to_project(watch_project.project) %></td>
</tr>
<tr>
<td colspan="2" width="580" >
<p class="font_description">
<%= watch_project.project.description%>
</p></td>
</tr>
<tr>
<td align="left"><span class="font_lighter"> <%= format_time(watch_project.created_on) %></span></td><!-- modified by ming -->
</tr>
</table></td>
</tr> </tr>
<tr>
<td colspan="2" width="580" >
<p class="font_description">
<%= watch_project.project.description%>
</p></td>
</tr>
<tr>
<td align="left"><span class="font_lighter"> <%= format_time(watch_project.created_on) %></span></td><!-- modified by ming -->
</tr>
</table></td>
</tr>
</table> </table>
</li> </li>
<% end %> <% end %>
<% else %> <% else %>
还米有关注任何项目 <%= l(:label_watch_no_projects)%>
<% end %> <% end %>

4
config/locales/zh.yml
View File

@ -1648,3 +1648,7 @@ zh:
label_homework_prompt_content: 亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以 label_homework_prompt_content: 亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以
label_create_homework: 布置了作业： label_create_homework: 布置了作业：
label_watch_project: 关注了 label_watch_project: 关注了
label_watch_no_projects: 没有关注任何项目
label_has_watched_project: 关注的项目
label_project_take: 参与的项目
label_peoject_take_in: 加入了项目：