ishapi 0.1.8.234 → 0.1.8.235
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a99137025c2a51a037e486a1d83b58d5c78ca5c649321a084838a40091eade12
|
|
4
|
+
data.tar.gz: 5a3acd8b759ad65a7fa8133a58a115ea7b6308f788fb9cf46bd55bd4e6af5d4c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a45d2b0bb0a39b606495666938cf3ea701743a7c1d3a7bc0fc0f81e846a2ce989db9e3b05ab330a46889f4875efe195ed39c831adf43802b9a06f225c485c194
|
|
7
|
+
data.tar.gz: 6c040942ac37a423ff53c0f01ef83fd536e97a65a38c3be186ac6326960b7bfb3f608fb988e6622e30bdad22efe31850981e1c7f6402f29bec6bebf942827be5
|
|
@@ -12,7 +12,10 @@ module Ishapi
|
|
|
12
12
|
def delete
|
|
13
13
|
authorize! :email_conversations_delete, ::Ishapi
|
|
14
14
|
convos = Office::EmailConversation.find params[:ids]
|
|
15
|
-
convos.map
|
|
15
|
+
outs = convos.map do |convo|
|
|
16
|
+
convo.add_tag( WpTag::EMAILTAG_TRASH )
|
|
17
|
+
end
|
|
18
|
+
flash[:notice] = "outcome: #{outs}"
|
|
16
19
|
end
|
|
17
20
|
|
|
18
21
|
end
|
|
@@ -96,7 +96,13 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
|
|
|
96
96
|
|
|
97
97
|
if the_mail.parts.length == 0
|
|
98
98
|
body = the_mail.body.decoded
|
|
99
|
-
|
|
99
|
+
if the_mail.content_type.include?('text/html')
|
|
100
|
+
@message.part_html = body
|
|
101
|
+
elsif the_mail.content_type.include?('text/plain')
|
|
102
|
+
@message.part_txt = body
|
|
103
|
+
else
|
|
104
|
+
throw "mail body of unknown type: #{the_mail.content_type}"
|
|
105
|
+
end
|
|
100
106
|
end
|
|
101
107
|
|
|
102
108
|
## Conversation
|