Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

README.md

@@ -1348,19 +1348,24 @@ curl -X GET http://localhost:3000/api/projects/mirror_demo/branches | jq
 ```
 ---
 
-### 获取版本列表
+### 获取代码库标签列表
 ```
 GET  /api/repositories/:id/tags
 ```
 *示例*
 ```
-curl -X GET http://localhost:3000/api/repositories/124/tags.json | jq
+curl -X GET \
+-d "limit=20" \
+-d "page=1" \
+http://localhost:3000/api/repositories/5836/tags.json | jq
 ```
 *请求参数说明:*
 
 |参数名|必选|类型|说明|
 |-|-|-|-|
-|id               |是|int |项目id  |
+|id          |是|int |仓库id  |
+|page        |否|string |页数，第几页  |
+|limit       |否|string |每页多少条数据，默认20条  |
 
 
 *返回参数说明:*

app/controllers/repositories_controller.rb

@@ -2,8 +2,9 @@ class RepositoriesController < ApplicationController
   include ApplicationHelper
   include OperateProjectAbilityAble
   before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror]
-  before_action :find_project, :authorizate!
+  before_action :find_project, except: :tags
-  before_action :find_repository, only: %i[sync_mirror]
+  before_action :authorizate!, except: [:sync_mirror, :tags]
+  before_action :find_repository, only: %i[sync_mirror tags]
   before_action :authorizate_user_can_edit_project!, only: %i[sync_mirror]
 
   def show
@@ -49,7 +50,7 @@ class RepositoriesController < ApplicationController
   end
 
   def tags
-    @tags = Gitea::Repository::Tags::ListService.new(@project, @project.identifier).call
+    @tags = Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @repo.user.login, @repo.identifier, {page: params[:page], limit: params[:limit]}).call
   end
 
   def edit

app/helpers/projects_helper.rb

@@ -3,7 +3,7 @@ module ProjectsHelper
   def render_zh_project_type(project_type)
     case project_type
     when 'common' then "开源托管项目"
-    when 'mirror' then "开源镜像项目"
+    when 'mirror', 'sync_mirror' then "开源镜像项目"
     end
   end
 

app/models/concerns/project_operable.rb

@@ -46,6 +46,7 @@ module ProjectOperable
   def develper?(user)
     developers.exists? user
   end
+
   # 报告者，只有可读权限
   def reporter?(user)
     reporters.exists? user

app/services/gitea/client_service.rb

@@ -17,7 +17,6 @@ class Gitea::ClientService < ApplicationService
   # }
   def post(url, params={})
     puts "[gitea] request params: #{params}"
-    Rails.logger.info("##########___________post_params__________########{params}")
     request_url = [api_url, url].join('').freeze
     auth_token = authen_params(params[:token])
     response = conn(auth_token).post do |req|

app/services/gitea/repository/tags/list_service.rb

@@ -1,25 +1,35 @@
 class Gitea::Repository::Tags::ListService < Gitea::ClientService
-  attr_reader :user, :repo_name
+  attr_reader :token, :owner, :repo, :params
 
   # ref: The name of the commit/branch/tag. Default the repository’s default branch (usually master)
-  # repo_name: the name of repository
+  # repo: the name of repository
-  def initialize(user, repo_name)
+  def initialize(token, owner, repo, params={})
-    @user      = user
+    @token  = token
-    @repo_name = repo_name
+    @owner  = owner
+    @repo   = repo
+    @params = params
   end
 
   def call
-    response = get(url, params)
+    response = get(url, request_params)
     render_result(response)
   end
 
   private
-  def params
+  def request_params
-    Hash.new.merge(token: user.gitea_token)
+    Hash.new.merge(token: token, page: set_page, limit: set_limit)
+  end
+
+  def set_page
+    (params[:page] || 1).to_i
+  end
+
+  def set_limit
+    (params[:limit] || 50).to_i
   end
 
   def url
-    "/repos/#{user.login}/#{repo_name}/tags".freeze
+    "/repos/#{owner}/#{repo}/tags".freeze
   end
 
   def render_result(response)

app/views/repositories/show.json.jbuilder

@@ -1,13 +1,14 @@
 json.identifier @project.identifier
 json.name @project.name
 json.project_id @project.id
+json.repo_id @project.repository.id
 json.issues_count @project.issues_count
 json.pull_requests_count @project.pull_requests_count
 json.project_identifier @project.identifier
 json.praises_count @project.praises_count.to_i
 json.forked_count @project.forked_count.to_i
 json.watchers_count @project.watchers_count.to_i
-json.versions_count @project.versions_count  #里程碑数量 
+json.versions_count @project.versions_count  #里程碑数量
 json.version_releases_count @project.releases_size(current_user.try(:id), "all")
 json.version_releasesed_count @project.releases_size(current_user.try(:id), "released")  #已发行的版本
 json.contributor_users_count @project.contributor_users
@@ -18,6 +19,7 @@ json.permission render_edit_project_permission(current_user, @project) if curren
 json.mirror_url @project&.repository.mirror_url
 json.watched current_user&.watched?(@project)
 json.praised current_user&.liked?(@project)
+json.status @project.status
 json.forked_from_project_id @project_fork_id
 json.fork_info do
   if @fork_project.present?