Browse Source

fix: template message settinng type order by order index

tags/v4.0.0
yystopf 4 years ago
parent
commit
7d98bd0bbe
5 changed files with 17 additions and 1 deletions
  1. +4
    -0
      app/models/template_message_setting/create_or_assign.rb
  2. +4
    -0
      app/models/template_message_setting/manage_project.rb
  3. +4
    -0
      app/models/template_message_setting/normal.rb
  4. +4
    -0
      app/models/template_message_setting/watch_project.rb
  5. +1
    -1
      app/views/template_message_settings/index.json.jbuilder

+ 4
- 0
app/models/template_message_setting/create_or_assign.rb View File

@@ -20,6 +20,10 @@ class TemplateMessageSetting::CreateOrAssign < TemplateMessageSetting
"我创建的或负责的"
end

def self.order_index
20
end

def self.build_init_data
self.find_or_create_by(name: "易修被指派", key: "IssueAssigned")
self.find_or_create_by(name: "合并请求被指派", key: "PullRequestAssigned")


+ 4
- 0
app/models/template_message_setting/manage_project.rb View File

@@ -20,6 +20,10 @@ class TemplateMessageSetting::ManageProject < TemplateMessageSetting
"我管理的仓库"
end

def self.order_index
30
end

def self.build_init_data
self.find_or_create_by(name: "有新的易修", key: "Issue")
self.find_or_create_by(name: "有新的合并请求", key: "PullRequest")


+ 4
- 0
app/models/template_message_setting/normal.rb View File

@@ -19,6 +19,10 @@ class TemplateMessageSetting::Normal < TemplateMessageSetting
""
end

def self.order_index
10
end

def self.build_init_data
self.find_or_create_by(name: "被拉入或移出组织", key: "Organization")
self.find_or_create_by(name: "被拉入或移出项目", key: "Project")


+ 4
- 0
app/models/template_message_setting/watch_project.rb View File

@@ -20,6 +20,10 @@ class TemplateMessageSetting::WatchProject < TemplateMessageSetting
"我关注的仓库"
end

def self.order_index
40
end

def self.build_init_data
end
end

+ 1
- 1
app/views/template_message_settings/index.json.jbuilder View File

@@ -1,7 +1,7 @@
json.partial! "commons/success"
json.setting_types do

json.array! @group_settings.keys.sort_by{|i| i.constantize.type_name}.each do |k|
json.array! @group_settings.keys.sort_by{|i| i.constantize.order_index}.each do |k|
json.partial! "detail", type: k, count: @group_settings[k]
end



Loading…
Cancel
Save