From a810be9528ec2116930ccd20c8ca12872002f96e Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 27 Mar 2020 17:30:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E8=AE=BA=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 4 ++-- app/controllers/journals_controller.rb | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 078589725..ba93d23d5 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -11,7 +11,7 @@ class IssuesController < ApplicationController include TagChosenHelper def index - @user_admin_or_member = current_user.logged? && (current_user.admin || @project.member?(current_user)) + @user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user)) issues = @project.issues.issue_issue.includes(:user,:tracker, :priority, :version, :issue_status, :journals, :issue_times) issues = issues.where(is_private: false) unless @user_admin_or_member @all_issues_size = issues.size @@ -276,7 +276,7 @@ class IssuesController < ApplicationController end def show - @user_permission = current_user.logged? && (!@issue.is_lock || @project.member?(current_user) || current_user.admin? || @issue.user == current_user) + @user_permission = current_user.present? && current_user.logged? && (!@issue.is_lock || @project.member?(current_user) || current_user.admin? || @issue.user == current_user) @issue_attachments = @issue.attachments @issue_user = @issue.user @issue_assign_to = @issue.get_assign_user diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index 5e255f968..8803634ef 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -16,8 +16,6 @@ class JournalsController < ApplicationController notes = params[:content] if notes.blank? normal_status(-1, "评论内容不能为空") - elsif current_user.logged? - normal_status(-1, "请登录") else journal_params = { journalized_id: @issue.id ,