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

个人主页课程列表加入了“退出课程”和加入课程按钮

This commit is contained in:
huangjingquan 2013-11-01 09:06:06 +08:00
parent b2080a4470
commit 5febe8a58d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/members_controller.rb
View File

@ -100,7 +100,7 @@ class MembersController < ApplicationController
#added by nie #added by nie
if(params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3") if(params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
@projectInfo = ProjectInfo.new(:user_id => @member.user_id, :project_id => @project.id) @projectInfo = ProjectInfo.new(:user_id => @member.user_id, :project_id => @project.id)
@projectInfo.save @projectInfo.save
else else
user_admin = ProjectInfo.where("user_id = ? and project_id = ?", @member.user_id, @project.id) user_admin = ProjectInfo.where("user_id = ? and project_id = ?", @member.user_id, @project.id)
if user_admin.size > 0 if user_admin.size > 0

6
app/controllers/projects_controller.rb
View File

@ -748,7 +748,7 @@ class ProjectsController < ApplicationController
# @course_tag = params[:course] # @course_tag = params[:course]
# if @course_tag == '1' # if @course_tag == '1'
if @project.project_type == 1 if @project.project_type == 1
@course = Course.find_by_extra(@project.identifier) @course = Course.find_by_extra(@project.identifier)
render :layout => 'base_courses' render :layout => 'base_courses'
else else
render :layout => 'base_projects' render :layout => 'base_projects'
@ -762,7 +762,7 @@ class ProjectsController < ApplicationController
#by young #by young
def member def member
if @project.project_type == 1 if @project.project_type == 1
render :layout => 'base_courses' render :layout => 'base_courses'
end end
# roles = Role.find_all_givable # roles = Role.find_all_givable
# members = @project.member_principals.includes(:roles, :principal).all.sort # members = @project.member_principals.includes(:roles, :principal).all.sort
@ -912,7 +912,7 @@ class ProjectsController < ApplicationController
def watcherlist def watcherlist
if @watched if @watched
@users -= watched.watcher_users @users -= watched.watcher_users
end end
end end
end end

6
app/views/users/_course_form.html.erb
View File

@ -9,8 +9,10 @@
<table width="580" border="0"> <table width="580" border="0">
<tr> <tr>
<td colspan="2" valign="top"><span><%= link_to_project(membership.project) %></span> <td colspan="2" valign="top"><span><%= link_to_project(membership.project) %></span>
<span></span> <span>
<span style="float: right"><%= l(:label_x_base_courses_member, :count => membership.project.members.count) %>(<%= link_to "#{membership.project.members.count}", project_member_path(membership.project), :course =>'1' %>)&nbsp;&nbsp;
</span>
<span style="float: right"><%= join_in_course(membership.project, User.current)%>&nbsp;&nbsp;&nbsp;&nbsp;<%= l(:label_x_base_courses_member, :count => membership.project.members.count) %>(<%= link_to "#{membership.project.members.count}", project_member_path(membership.project), :course =>'1' %>)&nbsp;&nbsp;
<%= l(:label_homework) %> (<span class=""><%= link_to (membership.project.homeworks.count), {:controller => 'projects', :action => 'homework', :id => membership.project.identifier} %></span>) <%= l(:label_homework) %> (<span class=""><%= link_to (membership.project.homeworks.count), {:controller => 'projects', :action => 'homework', :id => membership.project.identifier} %></span>)
&nbsp;&nbsp; &nbsp;&nbsp;
<%= l(:label_course_news)%> (<span style="color: #ed8924"><%= link_to (membership.project.news.count), {:controller => 'news', :action => 'index', :project_id => membership.project.identifier} %></span>) <%= l(:label_course_news)%> (<span style="color: #ed8924"><%= link_to (membership.project.news.count), {:controller => 'news', :action => 'index', :project_id => membership.project.identifier} %></span>)