floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-02 19:30:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop

Browse Source
This commit is contained in:
Jasder
2020-03-27 17:31:42 +08:00
parent 7ffc99b9d2 a810be9528
commit aeefa49559
39 changed files with 948225 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issue_tags_controller.rb
View File

@@ -1,5 +1,5 @@
class IssueTagsController < ApplicationController
before_action :require_login
before_action :require_login, except: [:index]
before_action :find_project_with_id
before_action :set_project
before_action :check_issue_permission, except: :index

6
app/controllers/issues_controller.rb
View File

@@ -1,5 +1,5 @@
class IssuesController < ApplicationController
before_action :require_login, except: [:index, :show]
before_action :require_login, except: [:index, :show, :index_chosen]
before_action :find_project_with_id
before_action :set_project_and_user
before_action :check_project_public, only: [:index ,:show, :copy, :index_chosen, :close_issue]
@@ -11,7 +11,7 @@ class IssuesController < ApplicationController
include TagChosenHelper
def index
@user_admin_or_member = current_user.present? && (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.present? && (!@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

2
app/controllers/journals_controller.rb
View File

@@ -1,5 +1,5 @@
class JournalsController < ApplicationController
before_action :require_login
before_action :require_login, except: :index
before_action :set_issue
before_action :check_issue_permission
before_action :set_journal, only: [:destroy, :edit, :update]

4
app/controllers/pull_requests_controller.rb
View File

@@ -1,5 +1,5 @@
class PullRequestsController < ApplicationController
before_action :require_login
before_action :require_login, except: [:index, :show]
before_action :find_project_with_id
before_action :set_repository
before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge]
@@ -243,7 +243,7 @@ class PullRequestsController < ApplicationController
end
def show
@user_permission = current_user.present? && (!@issue.is_lock || @project.member?(current_user) || current_user.admin? || @issue.user == current_user)
@user_permission = 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

2
app/controllers/versions_controller.rb
View File

@@ -1,5 +1,5 @@
class VersionsController < ApplicationController
before_action :require_login
before_action :require_login, except: [:index, :show]
before_action :find_project_with_id
before_action :check_issue_permission, except: [:show, :index]
before_action :set_version, only: [:edit, :update, :destroy, :show,:update_status]

2
app/models/project.rb
View File

@@ -100,7 +100,7 @@ class Project < ApplicationRecord
end
def self.list_user_projects(user_id)
user_not_show = Project.joins(:members).where("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, user_id,user_id).pluck(:id).uniq
user_not_show = Project.joins(:members).where("projects.is_public = ? and projects.user_id != ? and members.user_id != ?", false, user_id,user_id).pluck(:id).uniq
Project.where.not(id: user_not_show)
end