Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'private-seed_improve_state_ids_state_type' into develop

Browse source
This commit is contained in:
Martin Edenhofer 2017-03-31 16:17:13 +02:00
parent 90fcff7bd9 53cd59902e
commit 49c3d4c2ec
2 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models/ticket/state.rb
View file

@ -16,7 +16,7 @@ class Ticket::State < ApplicationModel
looks up states for a given category looks up states for a given category
states = Ticket::State.by_category(:open) # :open|:closed|:work_on|:work_on_all|:viewable|:pending_reminder|:pending_action|:merged states = Ticket::State.by_category(:open) # :open|:closed|:work_on|:work_on_all|:viewable|:viewable_agent_new|:viewable_agent_edit|:viewable_customer_new|:viewable_customer_edit|:pending_reminder|:pending_action|:pending|:merged
returns: returns:
@ -33,12 +33,22 @@ returns:
state_types = ['pending reminder'] state_types = ['pending reminder']
when :pending_action when :pending_action
state_types = ['pending action'] state_types = ['pending action']
when :pending
state_types = ['pending reminder', 'pending action']
when :work_on when :work_on
state_types = %w(new open) state_types = %w(new open)
when :work_on_all when :work_on_all
state_types = ['new', 'open', 'pending reminder'] state_types = ['new', 'open', 'pending reminder']
when :viewable when :viewable
state_types = ['new', 'open', 'pending reminder', 'pending action', 'closed', 'removed'] state_types = ['new', 'open', 'pending reminder', 'pending action', 'closed', 'removed']
when :viewable_agent_new
state_types = ['new', 'open', 'pending reminder', 'pending action', 'closed']
when :viewable_agent_edit
state_types = ['open', 'pending reminder', 'pending action', 'closed']
when :viewable_customer_new
state_types = %w(new closed)
when :viewable_customer_edit
state_types = %w(open closed)
when :closed when :closed
state_types = %w(closed) state_types = %w(closed)
when :merged when :merged

36
db/seeds.rb
View file

@ -3846,13 +3846,7 @@ ObjectManager::Attribute.add(
null: false, null: false,
default: Ticket::State.find_by(name: 'open').id, default: Ticket::State.find_by(name: 'open').id,
translate: true, translate: true,
filter: [ filter: Ticket::State.by_category(:viewable).pluck(:id),
Ticket::State.find_by(name: 'new').id,
Ticket::State.find_by(name: 'open').id,
Ticket::State.find_by(name: 'pending reminder').id,
Ticket::State.find_by(name: 'closed').id,
Ticket::State.find_by(name: 'pending close').id,
],
}, },
editable: false, editable: false,
active: true, active: true,
@ -3861,15 +3855,13 @@ ObjectManager::Attribute.add(
Agent: { Agent: {
null: false, null: false,
item_class: 'column', item_class: 'column',
filter: Ticket::State.by_category(:viewable_agent_new).pluck(:id),
}, },
Customer: { Customer: {
item_class: 'column', item_class: 'column',
nulloption: false, nulloption: false,
null: true, null: true,
filter: [ filter: Ticket::State.by_category(:viewable_customer_new).pluck(:id),
Ticket::State.find_by(name: 'new').id,
Ticket::State.find_by(name: 'closed').id
],
default: Ticket::State.find_by(name: 'new').id, default: Ticket::State.find_by(name: 'new').id,
}, },
}, },
@ -3877,20 +3869,12 @@ ObjectManager::Attribute.add(
Agent: { Agent: {
nulloption: false, nulloption: false,
null: false, null: false,
filter: [ filter: Ticket::State.by_category(:viewable_agent_edit).pluck(:id),
Ticket::State.find_by(name: 'open').id,
Ticket::State.find_by(name: 'pending reminder').id,
Ticket::State.find_by(name: 'closed').id,
Ticket::State.find_by(name: 'pending close').id,
],
}, },
Customer: { Customer: {
nulloption: false, nulloption: false,
null: true, null: true,
filter: [ filter: Ticket::State.by_category(:viewable_customer_edit).pluck(:id),
Ticket::State.find_by(name: 'open').id,
Ticket::State.find_by(name: 'closed').id
],
default: Ticket::State.find_by(name: 'open').id, default: Ticket::State.find_by(name: 'open').id,
}, },
}, },
@ -3913,16 +3897,10 @@ ObjectManager::Attribute.add(
null: true, null: true,
translate: true, translate: true,
required_if: { required_if: {
state_id: [ state_id: Ticket::State.by_category(:pending).pluck(:id),
Ticket::State.find_by(name: 'pending reminder').id,
Ticket::State.find_by(name: 'pending close').id,
]
}, },
shown_if: { shown_if: {
state_id: [ state_id: Ticket::State.by_category(:pending).pluck(:id),
Ticket::State.find_by(name: 'pending reminder').id,
Ticket::State.find_by(name: 'pending close').id,
]
}, },
}, },
editable: false, editable: false,