Merge branch 'dev_trustie' into dev_chain

2020-06-24 15:33:48 +08:00 · 2020-06-24 15:33:48 +08:00 · cfae67c3c9
parent d09e7b3439 788a6b3d86
commit cfae67c3c9
2 changed files with 2 additions and 2 deletions
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@ -5,7 +5,7 @@ module RepositoriesHelper
  end

  def download_type(str)
-    default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb png jpg gif tif psd svg)
+    default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb png jpg gif tif psd svg RData rdata)
    default_type.include?(str&.downcase)
  end

--- a/app/models/mirror.rb
+++ b/app/models/mirror.rb
@ -4,7 +4,7 @@ class Mirror < ApplicationRecord
  # 0: 同步镜像成功；1: 正在同步镜像；2: 同步失败，默认值为0
  enum status: { succeeded: 0, waiting: 1, failed: 2 }

-  belongs_to :repository
+  belongs_to :repository, foreign_key: :repo_id


  def set_status!(status=Mirror.statuses[:succeeded])