floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-03 03:40:49 +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-19 17:18:25 +08:00
parent 70de2ae571 12463c9c05
commit 65c51304c1
9 changed files with 145 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View File

@@ -1,6 +1,6 @@
class IssuesController < ApplicationController
before_action :require_login, except: [:index, :show]
before_action :find_project
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]
before_action :check_issue_permission, except: [:index, :show, :index_chosen]

2
app/controllers/project_trends_controller.rb
View File

@@ -1,5 +1,5 @@
class ProjectTrendsController < ApplicationController
before_action :find_project
before_action :find_project_with_id
before_action :check_project_public
def index

2
app/controllers/pull_requests_controller.rb
View File

@@ -1,6 +1,6 @@
class PullRequestsController < ApplicationController
before_action :require_login
before_action :find_project
before_action :find_project_with_id
before_action :set_repository
before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge]
include TagChosenHelper

17
app/controllers/repositories_controller.rb
View File

@@ -1,10 +1,11 @@
class RepositoriesController < ApplicationController
include ApplicationHelper
before_action :find_user, :find_repository, :authorizate!
before_action :find_project_identifier
before_action :find_repository_with_project
before_action :find_user, :authorizate!
before_action :require_login, only: %i[edit]
def show
@project = @repo.project
@branches_count = Gitea::Repository::BranchesService.new(@user, @repo.identifier).call&.size
@commits_count = Gitea::Repository::Commits::ListService.new(@user, @repo.identifier).call[:total_count]
@result = Gitea::Repository::GetService.new(@user, @repo.identifier).call
@@ -14,7 +15,7 @@ class RepositoriesController < ApplicationController
end
def entries
@repo.project.increment!(:visits)
@project.increment!(:visits)
@ref = params[:branch] || "master"
@entries = Gitea::Repository::Entries::ListService.new(@user, @repo.identifier, ref:@ref).call
@entries = @entries.sort_by{ |hash| hash['type'] }
@@ -53,4 +54,14 @@ class RepositoriesController < ApplicationController
render_forbidden
end
end
def find_project_identifier
@project = Project.find_by(id: params[:repo_identifier])
render_not_found("未找到’#{params[:repo_identifier]}’相关的项目") unless @project
end
def find_repository_with_project
@repo = @project.repository
render_not_found("未找到’#{params[:repo_identifier]}’相关的仓库") unless @repo
end
end

2
app/controllers/version_releases_controller.rb
View File

@@ -1,5 +1,5 @@
class VersionReleasesController < ApplicationController
before_action :find_project
before_action :find_project_with_id
before_action :set_user_and_project
before_action :require_login, except: [:index]
before_action :find_version , only: [:edit, :update, :destroy]

2
app/controllers/versions_controller.rb
View File

@@ -1,6 +1,6 @@
class VersionsController < ApplicationController
before_action :require_login
before_action :find_project
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]