Merge pull request 'FIX 代码库二级页面改版以及其他bug' (#172) from develop into dev_trustie_server

2026-05-22 12:45:46 +08:00 · 2021-10-09 16:15:12 +08:00
parent bd1cd7ee13 ad3e1c706b
commit 3325ec842d
37 changed files with 1265 additions and 269 deletions
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -15,7 +15,7 @@ class IssuesController < ApplicationController
  include TagChosenHelper

  def index
-    @user_admin_or_member = current_user.present? && 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) || @project.is_public?)
    issues = @project.issues.issue_issue.issue_index_includes
    issues = issues.where(is_private: false) unless @user_admin_or_member

@@ -453,7 +453,7 @@ class IssuesController < ApplicationController
  end

  def operate_issue_permission
-    return render_forbidden("您没有权限进行此操作.") unless current_user.admin? || @project.member?(current_user)
+    return render_forbidden("您没有权限进行此操作.") unless current_user.present? && current_user.logged? && (current_user.admin? || @project.member?(current_user) || @project.is_public?)
  end

  def export_issues(issues)
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -23,9 +23,9 @@ class MainController < ApplicationController

    # TODO: 这块之后需要整合，者架构重新变化，统一跳转到index后再路由分发
    if params[:path] && params[:path]&.include?("h5educoderbuild") && params[:path].split("/").first == "h5educoderbuild"
-      render file: 'public/h5educoderbuild/index.html', :layout => false
+      render file: 'public/h5educoderbuild/index.html', :layout => false, :content_type=> 'text/html'
    else
-      render file: 'public/react/build/index.html', :layout => false
+      render file: 'public/react/build/index.html', :layout => false, :content_type=> 'text/html'
    end

  end
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -4,7 +4,7 @@ class ProjectsController < ApplicationController
  include ProjectsHelper
  include Acceleratorable

-  before_action :require_login, except: %i[index branches group_type_list simple show fork_users praise_users watch_users recommend about menu_list]
+  before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend about menu_list]
  before_action :require_profile_completed, only: [:create, :migrate]
  before_action :load_repository, except: %i[index group_type_list migrate create recommend]
  before_action :authorizate_user_can_edit_project!, only: %i[update]
@@ -86,6 +86,13 @@ class ProjectsController < ApplicationController
    @branches =  result.is_a?(Hash) && result.key?(:status) ? [] : result
  end

+  def branches_slice
+    return @branches = [] unless @project.forge?
+
+    slice_result = Gitea::Repository::Branches::ListSliceService.call(@owner, @project.identifier)
+    @branches_slice = slice_result.is_a?(Hash) && slice_result.key?(:status) ? [] : slice_result
+  end
+
  def group_type_list
    project_statics = ProjectStatistic.first

--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -1,4 +1,5 @@
 class RepositoriesController < ApplicationController
+  include RepositoriesHelper
  include ApplicationHelper
  include OperateProjectAbilityAble
  include Repository::LanguagesPercentagable
@@ -54,16 +55,6 @@ class RepositoriesController < ApplicationController
      @entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call
      @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
      @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
-
-      # TODO
-      # 临时处理readme文件问题
-      result = Gitea::Repository::Readme::GetService.call(@owner.login, @project.identifier, @ref, @owner&.gitea_token)
-      @readme = 
-      if result[:status] == :success
-        result[:body]
-      else
-        {}
-      end
    end
  end

@@ -73,6 +64,7 @@ class RepositoriesController < ApplicationController

  def sub_entries
    file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
+    @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"

    if @project.educoder?
      if params[:type] === 'file'
@@ -103,10 +95,21 @@ class RepositoriesController < ApplicationController
  end

  def commits
-    @hash_commit = Gitea::Repository::Commits::ListService.new(@owner.login, @project.identifier,
-      sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
+    if params[:filepath].present?
+      file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
+      @hash_commit = Gitea::Repository::Commits::FileListService.new(@owner.login, @project.identifier, file_path_uri,
+        sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
+    else
+      @hash_commit = Gitea::Repository::Commits::ListService.new(@owner.login, @project.identifier,
+        sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
+    end
  end

+  def commits_slice 
+    @hash_commit = Gitea::Repository::Commits::ListSliceService.call(@owner.login, @project.identifier,
+      sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token)
+  end 
+
  def commit
    @sha         = params[:sha]
    @commit      = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token)
@@ -120,7 +123,11 @@ class RepositoriesController < ApplicationController
  end

  def contributors
-    @contributors = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
+    if params[:filepath].present? 
+      @contributors = []
+    else
+      @contributors = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
+    end
  end

  def edit
@@ -183,10 +190,16 @@ class RepositoriesController < ApplicationController
  end

  def readme
-    result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token)
-
+    if params[:filepath].present?
+      result = Gitea::Repository::Readme::DirService.call(@owner.login, @repository.identifier, params[:filepath], params[:ref], current_user&.gitea_token)
+    else
+      result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token)
+    end
    @readme = result[:status] === :success ? result[:body] : nil
-    render json: @readme
+    @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref])
+    render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha")
+  rescue 
+    render json: nil
  end

  def languages
@@ -214,7 +227,7 @@ class RepositoriesController < ApplicationController
    file_path = [domain, api_url, url].join
    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("&") if @repository.hidden?

-    redirect_to file_path
+    redirect_to URI.escape(file_path)
  end

  private
@@ -237,8 +250,14 @@ class RepositoriesController < ApplicationController

  # TODO 获取最新commit信息
  def project_commits
-    Gitea::Repository::Commits::ListService.new(@project.owner.login, @project.identifier,
-      sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
+    if params[:filepath].present?
+      file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
+      Gitea::Repository::Commits::FileListService.new(@project.owner.login, @project.identifier, file_path_uri,
+        sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
+    else
+      Gitea::Repository::Commits::ListService.new(@project.owner.login, @project.identifier,
+        sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
+    end
  end

  def get_statistics
--- a/app/controllers/version_releases_controller.rb
+++ b/app/controllers/version_releases_controller.rb
@@ -1,14 +1,14 @@
 class VersionReleasesController < ApplicationController
  before_action :load_repository
  before_action :set_user
-  before_action :require_login, except: [:index]
-  before_action :find_version , only: [:edit, :update, :destroy]
+  before_action :require_login, except: [:index, :show]
+  before_action :check_release_authorize, except: [:index, :show]
+  before_action :find_version , only: [:show, :edit, :update, :destroy]

  def index
-    version_releases = Gitea::Versions::ListService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier)).call
-    @version_releases = version_releases
+    @version_releases = kaminari_paginate(@repository.version_releases.order(created_at: :desc))
    @user_permission = current_user.present? && (@repository.project.all_developers.include?(current_user) || current_user.admin?)
-    @forge_releases = @repository.version_releases.select(:id,:version_gid, :created_at).includes(:attachments)
+    @user_admin_permission = current_user.present? && (@repository.project.all_managers.include?(current_user) || current_user.admin?)
  end

  def new
@@ -22,6 +22,10 @@ class VersionReleasesController < ApplicationController
    end
  end

+  def show 
+    # @release = Gitea::Versions::GetService.call(current_user.gitea_token, @user&.login, @repository&.identifier, @version&.version_gid)
+  end
+
  def create
    if params[:name].nil?
      normal_status(-1, "名称不能为空")
@@ -37,13 +41,14 @@ class VersionReleasesController < ApplicationController
          version_params = releases_params
          version_release = VersionRelease.new(version_params.merge(user_id: current_user.id, repository_id: @repository.id))
          if version_release.save!
-            git_version_release = Gitea::Versions::CreateService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params).call
+            git_version_release = Gitea::Versions::CreateService.new(current_user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params).call
            if git_version_release
              update_params = {
                tarball_url: git_version_release["tarball_url"],
                zipball_url: git_version_release["zipball_url"],
                url: git_version_release["url"],
                version_gid: git_version_release["id"],
+                sha: git_version_release["sha"]
              }
              version_release.update_attributes!(update_params)
              version_release.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
@@ -81,7 +86,7 @@ class VersionReleasesController < ApplicationController

          if @version.update_attributes!(version_params)
            create_attachments(params[:attachment_ids], @version) if params[:attachment_ids].present?
-            git_version_release = Gitea::Versions::UpdateService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params, @version.try(:version_gid)).call
+            git_version_release = Gitea::Versions::UpdateService.new(current_user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params, @version.try(:version_gid)).call
            unless git_version_release
              raise Error, "更新失败"
            end
@@ -102,7 +107,7 @@ class VersionReleasesController < ApplicationController
    ActiveRecord::Base.transaction do
      begin
        if @version.destroy
-          git_version_release = Gitea::Versions::DeleteService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier), @version.try(:version_gid)).call
+          git_version_release = Gitea::Versions::DeleteService.new(current_user.gitea_token, @user.try(:login), @repository.try(:identifier), @version.try(:version_gid)).call

          if git_version_release.status == 204
            normal_status(0, "删除成功")
@@ -157,4 +162,8 @@ class VersionReleasesController < ApplicationController
    end
  end

+  def check_release_authorize
+    return render_forbidden("您没有权限进行此操作.") unless current_user.admin? || @project.manager?(current_user)
+  end
+
 end