Fixed ticket selector.

This commit is contained in:
Martin Edenhofer 2015-09-28 14:02:12 +02:00
parent 1c9105b3f1
commit 6970999d92

View file

@ -46,11 +46,11 @@ class CalendarSubscriptions::Tickets
return events_data if owner_ids.empty? return events_data if owner_ids.empty?
condition = { condition = {
'tickets.owner_id' => { 'ticket.owner_id' => {
operator: 'is', operator: 'is',
value: owner_ids, value: owner_ids,
}, },
'tickets.state_id' => { 'ticket.state_id' => {
operator: 'is', operator: 'is',
value: Ticket::State.where( value: Ticket::State.where(
state_type_id: Ticket::StateType.where( state_type_id: Ticket::StateType.where(
@ -93,11 +93,11 @@ class CalendarSubscriptions::Tickets
return events_data if owner_ids.empty? return events_data if owner_ids.empty?
condition = { condition = {
'tickets.owner_id' => { 'ticket.owner_id' => {
operator: 'is', operator: 'is',
value: owner_ids, value: owner_ids,
}, },
'tickets.state_id' => { 'ticket.state_id' => {
operator: 'is', operator: 'is',
value: Ticket::State.where( value: Ticket::State.where(
state_type_id: Ticket::StateType.where( state_type_id: Ticket::StateType.where(
@ -150,11 +150,11 @@ class CalendarSubscriptions::Tickets
return events_data if owner_ids.empty? return events_data if owner_ids.empty?
condition = { condition = {
'tickets.owner_id' => { 'ticket.owner_id' => {
operator: 'is', operator: 'is',
value: owner_ids, value: owner_ids,
}, },
'tickets.escalation_time' => { 'ticket.escalation_time' => {
operator: 'is not', operator: 'is not',
value: nil, value: nil,
} }