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

Renamed x-headers.

Browse source
This commit is contained in:
Martin Edenhofer 2014-06-05 21:27:44 +02:00
parent 754840470f
commit 8edef05d85
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/postmaster_filters_controller.rb
View file

@ -17,7 +17,7 @@ Example:
"From":"some@example.com"
},
"perform":{
"x-zammad-priority":"3 high"
"x-zammad-ticket-priority":"3 high"
},
"note":"",
"active":true,
@ -93,7 +93,7 @@ Payload:
"From":"some@example.com"
},
"perform":{
"x-zammad-priority":"3 high"
"x-zammad-ticket-priority":"3 high"
},
"note":"",
"active":true,
@ -108,7 +108,7 @@ Response:
"From":"some@example.com"
},
"perform":{
"x-zammad-priority":"3 high"
"x-zammad-ticket-priority":"3 high"
},
"note": "",
"active":true,
@ -137,7 +137,7 @@ Payload:
"From":"some@example.com"
},
"perform":{
"x-zammad-priority":"3 high"
"x-zammad-ticket-priority":"3 high"
},
"note":"",
"active":true,
@ -151,7 +151,7 @@ Response:
"From":"some@example.com"
},
"perform":{
"x-zammad-priority":"3 high"
"x-zammad-ticket-priority":"3 high"
},
"note":"",
"active":true,

16
app/models/channel/email_parser.rb
View file

@ -44,10 +44,10 @@ class Channel::EmailParser
:x-zammad-customer-lastname => '',
# ticket headers
:x-zammad-group => 'some_group',
:x-zammad-state => 'some_state',
:x-zammad-priority => 'some_priority',
:x-zammad-owner => 'some_owner_login',
:x-zammad-ticket-group => 'some_group',
:x-zammad-ticket-state => 'some_state',
:x-zammad-ticket-priority => 'some_priority',
:x-zammad-ticket-owner => 'some_owner_login',
# article headers
:x-zammad-article-visibility => 'internal',
@ -381,10 +381,10 @@ class Channel::EmailParser
# x-headers lookup
map = [
[ 'x-zammad-group', Group, 'group_id', 'name' ],
[ 'x-zammad-state', Ticket::State, 'ticket_state_id', 'name' ],
[ 'x-zammad-priority', Ticket::Priority, 'ticket_priority_id', 'name' ],
[ 'x-zammad-owner', User, 'owner_id', 'login' ],
[ 'x-zammad-ticket-group', Group, 'group_id', 'name' ],
[ 'x-zammad-ticket-state', Ticket::State, 'ticket_state_id', 'name' ],
[ 'x-zammad-ticket-priority', Ticket::Priority, 'ticket_priority_id', 'name' ],
[ 'x-zammad-ticket-owner', User, 'owner_id', 'login' ],
]
object_lookup( ticket_attributes, map, mail )

2
test/unit/email_process_test.rb
View file

@ -25,7 +25,7 @@ Some Text',
:data => 'From: me@example.com
To: customer@example.com
Subject: some subject
X-Zammad-Priority: 3 high
X-Zammad-Ticket-Priority: 3 high
X-Zammad-Article-Sender: system
x-Zammad-Article-Type: phone