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

app/controllers/issues_controller.rb

@@ -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]

app/controllers/project_trends_controller.rb

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

app/controllers/pull_requests_controller.rb

@@ -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

app/controllers/repositories_controller.rb

@@ -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

app/controllers/version_releases_controller.rb

@@ -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]

app/controllers/versions_controller.rb

@@ -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]
 

app/jobs/sync_forge_job.rb

@@ -142,7 +142,7 @@ class SyncForgeJob < ApplicationJob
           if Project.exists?(identifier: project_identifier)
             failed_dic = "public/sync_failed_users.dic"
             File.open(failed_dic,"a") do |file|
-              file.puts "[\nTime---#{Time.now}\nproject_info---#{project}\n---]\n "
+              file.puts "[\nTime---#{Time.now}\nproject_info---#{project}\nerrors---exists the same project:#{project_identifier}]\n "
             end
           else
             new_project = Project.new(project&.except!(*keys_to_delete).merge(user_id: new_user.id))

app/models/journal.rb

@@ -19,127 +19,129 @@ class Journal < ApplicationRecord
       details = self.journal_details.select(:property, :prop_key, :old_value, :value).pluck(:property, :prop_key, :old_value, :value)
       if details.size > 0
         details.each do |de|
-          if de[0] == "attr"
-            content = ""
-          else
-            content = "附件"
-          end
-          old_value = de[2]
-          value = de[3]
-          if de[1].to_i > 0
-            prop_name = ""
-          else
-            prop_name = I18n.t("journal_detail.#{de[1]}")
-            case de[1]
-            when "is_private"
-              old_value = I18n.t("journal_detail.#{de[2]}")
-              value = I18n.t("journal_detail.#{de[3]}")
-            when "assigned_to_id"
-              u = User.select(:id, :login, :lastname, :firstname, :nickname)
-              old_value = de[2].to_i > 0 ? u.find_by_id(de[2]).try(:show_real_name) : ""
-              assign_user = de[3].to_i > 0 ? u.find_by_id(de[3]) : ""
-              if assign_user.present?
-                value = assign_user.try(:show_real_name)
-              else
-                value = ""
-              end
-
-            when "tracker_id"
-              t = Tracker.select(:id, :name)
-              old_value = de[2].to_i > 0 ? t.find_by_id(de[2]).try(:name) : ""
-              tracker_name = de[3].to_i > 0 ? t.find_by_id(de[3]) : ""
-              if tracker_name
-                value = tracker_name.try(:name)
-              else
-                value = ""
-              end
-
-            when "status_id"
-              t = IssueStatus.select(:id, :name)
-              old_value = de[2].to_i > 0 ? t.find_by_id(de[2]).try(:name) : ""
-              type_name = de[3].to_i > 0 ? t.find_by_id(de[3]) : ""
-              if type_name
-                value = type_name.try(:name)
-              else
-                value = ""
-              end
-            when "priority_id"
-              t = IssuePriority.select(:id, :name)
-              old_value = de[2].to_i > 0 ? t.find_by_id(de[2]).try(:name): ""
-              type_name = de[3].to_i > 0 ? t.find_by_id(de[3]) : ""
-              if type_name
-                value = type_name.try(:name)
-              else
-                value = ""
-              end
-            when "issue_tags_value"
-              t = IssueTag.select(:id, :name)
-              old_value = de[2].to_i > 0 ? t.where(id: de[2].split(",")).select(:id,:name,:color).as_json : ""
-              if de[3].present?
-                value = t.where(id: de[3].split(",")).select(:id,:name,:color).as_json
-              else
-                value = ""
-              end
-            when "fixed_version_id"
-              t = Version.select(:id, :name)
-              old_value = de[2].to_i > 0 ? t.find_by_id(de[2]).try(:name) : ""
-              type_name = de[3].to_i > 0 ? t.find_by_id(de[3]) : ""
-              if type_name
-                value = type_name.try(:name)
-              else
-                value = ""
-              end
-            when "end_time"
-              t = IssueTime.select(:id, :start_time, :end_time)
-              type_name = de[2].to_i > 0 ? t.find_by_id(de[2]) : ""
-              if type_name.present?
-                old_value = "停止工作"
-                d_value = type_name.end_time.to_i - type_name.start_time.to_i
-                value = "#{Time.at(d_value).utc.strftime('%H h %M min %S s')}"
-              else
-                old_value = "停止工作"
-                value = ""
-              end
-            when "issue_depend"
-              t = Issue.select(:id,:subject )
-              type_name = de[3].present? ? t&.find_by_id(de[3]) : ""
-              if type_name.present?
-                old_value = "增加依赖"
-                value = {
-                  id: de[3],
-                  name: type_name.try(:subject)
-                }
-              else
-                old_value = "增加依赖"
-                value = ""
-              end
-            when "destroy_issue_depend"
-              t = Issue.select(:id,:subject )
-              type_name = de[3].present? ? t&.find_by_id(de[3]) : ""
-              if type_name.present?
-                old_value = "删除依赖"
-                value = {
-                  id: de[3],
-                  name: type_name.try(:subject)
-                }
-              else
-                old_value = "删除依赖"
-                value = ""
-              end
-            when "done_ratio"
-              old_value = "#{de[2]}%"
-              value = "#{de[3]}%"
+          unless de[1].to_s == "description"
+            if de[0] == "attr"
+              content = ""
             else
-              old_value = de[2]
-              value = de[3]
+              content = "附件"
             end
+            old_value = de[2]
+            value = de[3]
+            if de[1].to_i > 0
+              prop_name = ""
+            else
+              prop_name = I18n.t("journal_detail.#{de[1]}")
+              case de[1]
+              when "is_private"
+                old_value = I18n.t("journal_detail.#{de[2]}")
+                value = I18n.t("journal_detail.#{de[3]}")
+              when "assigned_to_id"
+                u = User.select(:id, :login, :lastname, :firstname, :nickname)
+                old_value = de[2].to_i > 0 ? u.find_by_id(de[2]).try(:show_real_name) : ""
+                assign_user = de[3].to_i > 0 ? u.find_by_id(de[3]) : ""
+                if assign_user.present?
+                  value = assign_user.try(:show_real_name)
+                else
+                  value = ""
+                end
+
+              when "tracker_id"
+                t = Tracker.select(:id, :name)
+                old_value = de[2].to_i > 0 ? t.find_by_id(de[2]).try(:name) : ""
+                tracker_name = de[3].to_i > 0 ? t.find_by_id(de[3]) : ""
+                if tracker_name
+                  value = tracker_name.try(:name)
+                else
+                  value = ""
+                end
+
+              when "status_id"
+                t = IssueStatus.select(:id, :name)
+                old_value = de[2].to_i > 0 ? t.find_by_id(de[2]).try(:name) : ""
+                type_name = de[3].to_i > 0 ? t.find_by_id(de[3]) : ""
+                if type_name
+                  value = type_name.try(:name)
+                else
+                  value = ""
+                end
+              when "priority_id"
+                t = IssuePriority.select(:id, :name)
+                old_value = de[2].to_i > 0 ? t.find_by_id(de[2]).try(:name): ""
+                type_name = de[3].to_i > 0 ? t.find_by_id(de[3]) : ""
+                if type_name
+                  value = type_name.try(:name)
+                else
+                  value = ""
+                end
+              when "issue_tags_value"
+                t = IssueTag.select(:id, :name)
+                old_value = de[2].to_i > 0 ? t.where(id: de[2].split(",")).select(:id,:name,:color).as_json : ""
+                if de[3].present?
+                  value = t.where(id: de[3].split(",")).select(:id,:name,:color).as_json
+                else
+                  value = ""
+                end
+              when "fixed_version_id"
+                t = Version.select(:id, :name)
+                old_value = de[2].to_i > 0 ? t.find_by_id(de[2]).try(:name) : ""
+                type_name = de[3].to_i > 0 ? t.find_by_id(de[3]) : ""
+                if type_name
+                  value = type_name.try(:name)
+                else
+                  value = ""
+                end
+              when "end_time"
+                t = IssueTime.select(:id, :start_time, :end_time)
+                type_name = de[2].to_i > 0 ? t.find_by_id(de[2]) : ""
+                if type_name.present?
+                  old_value = "停止工作"
+                  d_value = type_name.end_time.to_i - type_name.start_time.to_i
+                  value = "#{Time.at(d_value).utc.strftime('%H h %M min %S s')}"
+                else
+                  old_value = "停止工作"
+                  value = ""
+                end
+              when "issue_depend"
+                t = Issue.select(:id,:subject )
+                type_name = de[3].present? ? t&.find_by_id(de[3]) : ""
+                if type_name.present?
+                  old_value = "增加依赖"
+                  value = {
+                    id: de[3],
+                    name: type_name.try(:subject)
+                  }
+                else
+                  old_value = "增加依赖"
+                  value = ""
+                end
+              when "destroy_issue_depend"
+                t = Issue.select(:id,:subject )
+                type_name = de[3].present? ? t&.find_by_id(de[3]) : ""
+                if type_name.present?
+                  old_value = "删除依赖"
+                  value = {
+                    id: de[3],
+                    name: type_name.try(:subject)
+                  }
+                else
+                  old_value = "删除依赖"
+                  value = ""
+                end
+              when "done_ratio"
+                old_value = "#{de[2]}%"
+                value = "#{de[3]}%"
+              else
+                old_value = de[2]
+                value = de[3]
+              end
+            end
+            prop_hash = {
+              detail: (content + prop_name),
+              old_value: old_value,
+              value: value
+            }
+            send_details.push(prop_hash)
           end
-          prop_hash = {
-            detail: (content + prop_name),
-            old_value: old_value,
-            value: value
-          }
-          send_details.push(prop_hash)
         end
       end
     end

config/routes.rb

@@ -13,6 +13,11 @@ Rails.application.routes.draw do
   get 'auth/cas/callback', to: 'oauth/cas#create'
 
   scope '/api' do
+    resources :attachments do
+      collection do
+        delete :destroy_files
+      end
+    end
     resources :sync_forge, only: [:create]  #同步用户
     resources :composes do
       resources :compose_projects, only: [:create, :destroy]
@@ -319,12 +324,6 @@ Rails.application.routes.draw do
     end
 
 
-    resources :attachments do
-      collection do
-        delete :destroy_files
-      end
-    end
-
     resources :repertoires, only: [:index]
 
     scope module: :projects do