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