Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge

# Conflicts:
#	app/controllers/application_controller.rb

app/controllers/application_controller.rb

@@ -327,7 +327,7 @@ class ApplicationController < ActionController::Base
 	end
 
 	def current_user
-		User.current
+		# User.current
 		User.find_by_id 50207
 		# nil
 	end

app/controllers/issues_controller.rb

@@ -147,7 +147,7 @@ class IssuesController < ApplicationController
       issue_params = {
         subject: params[:subject],
         description: params[:description],
-        is_private: params[:is_private],
+        is_private: params[:is_private] || false,
         assigned_to_id: params[:assigned_to_id],
         tracker_id: params[:tracker_id],
         status_id: params[:status_id],
@@ -204,7 +204,7 @@ class IssuesController < ApplicationController
     issue_params = {
       subject: params[:subject],
       description: params[:description],
-      is_private: params[:is_private],
+      is_private: params[:is_private] || false,
       assigned_to_id: params[:assigned_to_id],
       tracker_id: params[:tracker_id],
       status_id: params[:status_id],
@@ -350,7 +350,7 @@ class IssuesController < ApplicationController
   end
 
   def check_project_public
-    unless @project.is_public || @project.member?(current_user) || current_user.admin?
+    unless @project.is_public || @project.member?(current_user) || current_user.admin? || (@project.user_id == current_user.id)
       normal_status(-1, "您没有权限")
     end
   end