From c56f6411637b5d2832145df5e74798e5722019bb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 30 Jan 2015 09:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE=E6=8C=89=E9=92=AE=E6=B2=A1=E5=8F=8D?=
 =?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 899997456..e3a804ef8 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -33,7 +33,7 @@ class ProjectsController < ApplicationController
   menu_item l(:label_course_news), :only => :index
   
 
-  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
+  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_project]
   # before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, 
   #               :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond, :share,
   #               :show_projects_score, :issue_score_index, :news_score_index, :file_score_index, :code_submit_score_index, :projects_topic_score_index]
@@ -910,6 +910,14 @@ class ProjectsController < ApplicationController
       end
     end
   end
+
+  #加入私有项目
+  def join_project
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
 
   def memberAccess