From d80600a58ce553c714d3342beaf4609dbc2574f8 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 12 Aug 2020 10:58:16 +0800
Subject: [PATCH] Change

---
 app/controllers/application_controller.rb              | 2 +-
 app/controllers/projects_controller.rb                 | 2 +-
 app/models/project.rb                                  | 2 +-
 app/views/users/projects/shared/_project.json.jbuilder | 4 ++--
 app/views/users/subjects/shared/_subject.json.jbuilder | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0ea9db177..d5f879696 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -750,7 +750,7 @@ class ApplicationController < ActionController::Base
 			@project
     elsif current_user.is_a?(AnonymousUser)
 			logger.info "###########：This is AnonymousUser"
-			@project = nil if !@project.is_public
+			@project = nil if @project && !@project.is_public?
 			render_forbidden and return
     else
 			logger.info "###########：project not found"
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 30fa96601..93c5f6941 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -116,7 +116,7 @@ class ProjectsController < ApplicationController
   end
 
   def project_public?
-    return if @project.is_public
+    return if @project.is_public?
 
     if current_user
       return if current_user.admin? || @project.member?(current_user.id)
diff --git a/app/models/project.rb b/app/models/project.rb
index 2519700ba..bd2008af6 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -122,7 +122,7 @@ class Project < ApplicationRecord
 
 
   def can_visited?
-    is_public || User.current.admin? || member?(User.current)
+    is_public? || User.current.admin? || member?(User.current)
   end
 
   def releases_size(current_user_id, type)
diff --git a/app/views/users/projects/shared/_project.json.jbuilder b/app/views/users/projects/shared/_project.json.jbuilder
index 9d1bad441..5cc985909 100644
--- a/app/views/users/projects/shared/_project.json.jbuilder
+++ b/app/views/users/projects/shared/_project.json.jbuilder
@@ -5,8 +5,8 @@ json.members_count project.members.count
 json.issues_count project.issues.count
 json.changesets_count project.project_score&.changeset_num.to_i
 
-json.is_public project&.is_public
-json.can_visited project&.can_visited?
+json.is_public project.is_public?
+json.can_visited project.can_visited?
 
 json.owner do
   json.partial! 'users/shared/real_user', user: project.owner
diff --git a/app/views/users/subjects/shared/_subject.json.jbuilder b/app/views/users/subjects/shared/_subject.json.jbuilder
index ad83b6ece..2059bc461 100644
--- a/app/views/users/subjects/shared/_subject.json.jbuilder
+++ b/app/views/users/subjects/shared/_subject.json.jbuilder
@@ -5,4 +5,4 @@ json.image_url url_to_avatar(subject)
 json.owner_id subject.user.id
 json.owner_name subject.user.full_name
 json.visits_count subject.visits
-json.can_visited subject&.can_visited?
+json.can_visited subject.can_visited?