From b645a1aa1e45bbfc0f5727c285b6979b91d68768 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 19 May 2015 14:25:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E6=9C=89=E9=A1=B9=E7=9B=AE=E6=88=90?= =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E9=9D=9E=E9=A1=B9=E7=9B=AE=E6=88=90?= =?UTF-8?q?=E5=91=98=E4=B8=8D=E8=83=BD=E9=80=9A=E8=BF=87URL=E8=AE=BF?= =?UTF-8?q?=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 12 ++++++++---- db/schema.rb | 9 ++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 06a157c0f..f8d08c7f5 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -417,10 +417,14 @@ class ProjectsController < ApplicationController @members = @project.member_principals.includes(:roles, :principal).all.sort end else - roles = Role.find_all_givable - @subPage_title = l :label_member_list - @members = @project.member_principals.includes(:roles, :principal).joins("LEFT JOIN #{OptionNumber.table_name} ON #{OptionNumber.table_name}.user_id = #{Member.table_name}.user_id and #{OptionNumber.table_name}.score_type = 2 AND #{Member.table_name}.project_id = #{OptionNumber.table_name}.project_id").order("#{OptionNumber.table_name}.total_score DESC").all - @applied_members = appied_project_members(@project, @members) + if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin? + render_403 + else + roles = Role.find_all_givable + @subPage_title = l :label_member_list + @members = @project.member_principals.includes(:roles, :principal).joins("LEFT JOIN #{OptionNumber.table_name} ON #{OptionNumber.table_name}.user_id = #{Member.table_name}.user_id and #{OptionNumber.table_name}.score_type = 2 AND #{Member.table_name}.project_id = #{OptionNumber.table_name}.project_id").order("#{OptionNumber.table_name}.total_score DESC").all + @applied_members = appied_project_members(@project, @members) + end end @members = paginateHelper @members render :layout => 'base_courses' if @project.project_type == 1 diff --git a/db/schema.rb b/db/schema.rb index 601963956..e3828b0be 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -541,7 +541,6 @@ ActiveRecord::Schema.define(:version => 20150514133640) do t.integer "is_teacher_score", :default => 0 end - add_index "homework_attaches", ["bid_id"], :name => "bid_id" add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id" create_table "homework_evaluations", :force => true do |t| @@ -556,9 +555,7 @@ ActiveRecord::Schema.define(:version => 20150514133640) do t.integer "bid_id" end - add_index "homework_for_courses", ["bid_id"], :name => "bid_id" add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id" - add_index "homework_for_courses", ["course_id"], :name => "course_id" add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id" create_table "homework_users", :force => true do |t| @@ -1163,14 +1160,12 @@ ActiveRecord::Schema.define(:version => 20150514133640) do create_table "students_for_courses", :force => true do |t| t.integer "student_id" t.integer "course_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "student_idCopy" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id" add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id" - add_index "students_for_courses", ["student_id"], :name => "student_id" create_table "taggings", :force => true do |t| t.integer "tag_id"