diff --git a/app/models/template_message_setting/create_or_assign.rb b/app/models/template_message_setting/create_or_assign.rb index 2bdcffc82..4de899068 100644 --- a/app/models/template_message_setting/create_or_assign.rb +++ b/app/models/template_message_setting/create_or_assign.rb @@ -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") diff --git a/app/models/template_message_setting/manage_project.rb b/app/models/template_message_setting/manage_project.rb index b1e69a5a9..18defc6c5 100644 --- a/app/models/template_message_setting/manage_project.rb +++ b/app/models/template_message_setting/manage_project.rb @@ -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") diff --git a/app/models/template_message_setting/normal.rb b/app/models/template_message_setting/normal.rb index 789e35b63..b0495b8c2 100644 --- a/app/models/template_message_setting/normal.rb +++ b/app/models/template_message_setting/normal.rb @@ -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") diff --git a/app/models/template_message_setting/watch_project.rb b/app/models/template_message_setting/watch_project.rb index 169e68e80..35dfef6db 100644 --- a/app/models/template_message_setting/watch_project.rb +++ b/app/models/template_message_setting/watch_project.rb @@ -20,6 +20,10 @@ class TemplateMessageSetting::WatchProject < TemplateMessageSetting "我关注的仓库" end + def self.order_index + 40 + end + def self.build_init_data end end diff --git a/app/views/template_message_settings/index.json.jbuilder b/app/views/template_message_settings/index.json.jbuilder index eae5bb018..4f863ce0f 100644 --- a/app/views/template_message_settings/index.json.jbuilder +++ b/app/views/template_message_settings/index.json.jbuilder @@ -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