diff --git a/app/assets/javascripts/app/models/core_workflow.coffee b/app/assets/javascripts/app/models/core_workflow.coffee index a35eceb5f..32e20811e 100644 --- a/app/assets/javascripts/app/models/core_workflow.coffee +++ b/app/assets/javascripts/app/models/core_workflow.coffee @@ -5,7 +5,7 @@ class App.CoreWorkflow extends App.Model @configure_attributes = [ { name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 100, null: false }, { name: 'object', display: 'Object', tag: 'select', null: false, nulloption: true }, - { name: 'preferences::screen', display: 'Action', tag: 'select', translate: true, null: true, multiple: true, nulloption: true }, + { name: 'preferences::screen', display: 'Context', tag: 'select', translate: true, null: true, multiple: true, nulloption: true }, { name: 'condition_selected', display: 'Selected conditions', tag: 'core_workflow_condition', null: true, preview: false }, { name: 'condition_saved', display: 'Saved conditions', tag: 'core_workflow_condition', null: true, preview: false }, { name: 'perform', display: 'Action', tag: 'core_workflow_perform', null: true, preview: false }, diff --git a/app/models/core_workflow.rb b/app/models/core_workflow.rb index 415c60dd4..47b15e7aa 100644 --- a/app/models/core_workflow.rb +++ b/app/models/core_workflow.rb @@ -4,7 +4,7 @@ class CoreWorkflow < ApplicationModel include ChecksClientNotification include CoreWorkflow::Assets - default_scope { order(priority: :asc, id: :asc) } + default_scope { order('priority ASC, name ASC, id ASC') } scope :active, -> { where(active: true) } scope :changeable, -> { where(changeable: true) } scope :object, ->(object) { where(object: [object, nil]) }