wco_email 0.1.1.35 → 0.1.1.36
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/wco_email/application_controller.rb +5 -1
- data/app/controllers/wco_email/email_filters_controller.rb +5 -0
- data/app/views/wco_email/_main_header.haml +1 -1
- data/app/views/wco_email/_sidebar.haml +2 -2
- data/app/views/wco_email/conversations/index.haml +2 -2
- data/app/views/wco_email/conversations/show.haml +1 -1
- data/app/views/wco_email/email_filters/show.haml +1 -1
- data/app/views/wco_email/messages/show.haml +1 -1
- data/config/routes.rb +5 -6
- metadata +1 -2
- data/config/trash/credentials.yml.enc +0 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 10449fe346daa296599af8fd3af1f36beb2605cf5777334699ab384f09d4589e
|
|
4
|
+
data.tar.gz: 6bb8a9b1c1177bd90600b335573e6ca9d28329be1223fc86fb7830e6cfe6b9f1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ee1f2e4ea09c3afc6dabbf0b4a0a553d330cd678bc831e2689c1780c261c597b232ba2136efbc4e8f8396601fe52727e0e00193583961c5c53069104f874d674
|
|
7
|
+
data.tar.gz: c1fe540f6cd41b777564f6d517cdd768eb3d8fe72deed96c4aac67872a80ddaddc7ee0fe9fd2a4cd25c0d988578b60881c36f67917b13be56a88c27c8d5c0ea9
|
|
@@ -50,6 +50,11 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
|
|
|
50
50
|
def update
|
|
51
51
|
@email_filter = WcoEmail::EmailFilter.find params[:id]
|
|
52
52
|
authorize! :update, @email_filter
|
|
53
|
+
|
|
54
|
+
if params[:email_filter][:tag].blank?
|
|
55
|
+
params[:email_filter].delete :tag
|
|
56
|
+
end
|
|
57
|
+
|
|
53
58
|
flag = @email_filter.update_attributes( params[:email_filter].permit! )
|
|
54
59
|
if flag
|
|
55
60
|
flash[:notice] = 'Success'
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
%ul.tags-list
|
|
4
4
|
- @tags.each do |tag|
|
|
5
5
|
%li
|
|
6
|
-
= link_to tag.slug,
|
|
6
|
+
= link_to tag.slug, conversations_in_path( tag.slug )
|
|
7
7
|
-# (#{tag.conversations.unread.length}, #{tag.conversations.length})
|
|
8
8
|
(#{tag.conversations.unread.length})
|
|
9
9
|
(#{tag.conversations.length})
|
|
10
|
-
= link_to "not",
|
|
10
|
+
= link_to "not", conversations_not_in_path( tag.slug )
|
|
11
11
|
|
|
@@ -36,9 +36,9 @@
|
|
|
36
36
|
= link_to lead.email, wco.lead_path( lead )
|
|
37
37
|
%td.subject
|
|
38
38
|
- if conv.unread?
|
|
39
|
-
<b>#{link_to conv.subject,
|
|
39
|
+
<b>#{link_to conv.subject, conversation_path(conv)}</b>
|
|
40
40
|
- else
|
|
41
|
-
= link_to conv.subject,
|
|
41
|
+
= link_to conv.subject, conversation_path(conv)
|
|
42
42
|
<b>(#{conv.messages.length})</b>
|
|
43
43
|
%span.gray= conv.preview
|
|
44
44
|
%td.tags.mini
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
- if @other_convs.present?
|
|
13
13
|
- @other_convs.each do |conv|
|
|
14
14
|
.d-flex
|
|
15
|
-
= button_to "Merge",
|
|
15
|
+
= button_to "Merge", merge_conversations_path( @conversation, conv ), data: { confirm: 'Are you sure?' }
|
|
16
16
|
= conv.subject
|
|
17
17
|
(#{conv.messages.length})
|
|
18
18
|
%span.gray.mini= conv.id
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
%h5
|
|
4
4
|
Message
|
|
5
5
|
<b>Subject:</b>
|
|
6
|
-
= link_to @message.conversation.subject,
|
|
6
|
+
= link_to @message.conversation.subject, conversation_path(@message.conversation)
|
|
7
7
|
(#{@message.conversation.messages.length})
|
|
8
8
|
|
|
9
9
|
= render 'meta', message: @message
|
data/config/routes.rb
CHANGED
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
|
|
2
2
|
WcoEmail::Engine.routes.draw do
|
|
3
3
|
# root to: '/wco_email/email_conversations#index'
|
|
4
|
-
root to: redirect('/email/conversations')
|
|
4
|
+
root to: redirect('/email/conversations/in/inbox')
|
|
5
5
|
|
|
6
6
|
get 'analytics', to: 'application#analytics'
|
|
7
7
|
get 'tinymce', to: 'application#tinymce', as: :application_tinymce
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
get 'conversations/in/:
|
|
11
|
-
get 'conversations
|
|
12
|
-
|
|
13
|
-
post 'conversations/:id1/merge/:id2', to: '/wco_email/conversations#merge', as: :merge_email_conversations
|
|
9
|
+
get 'conversations/in/:tagname', to: '/wco_email/conversations#index', as: :conversations_in
|
|
10
|
+
get 'conversations/not-in/:tagname_not', to: '/wco_email/conversations#index', as: :conversations_not_in
|
|
11
|
+
get 'conversations/:id', to: '/wco_email/conversations#show', as: :conversation
|
|
12
|
+
post 'conversations/:id1/merge/:id2', to: '/wco_email/conversations#merge', as: :merge_conversations
|
|
14
13
|
post 'conversations/addtag', to: 'conversations#addtag'
|
|
15
14
|
post 'conversations/addtag/:slug', to: 'conversations#addtag'
|
|
16
15
|
post 'conversations/rmtag', to: 'conversations#rmtag'
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: wco_email
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.1.
|
|
4
|
+
version: 0.1.1.36
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Victor Pudeyev
|
|
@@ -451,7 +451,6 @@ files:
|
|
|
451
451
|
- app/views/wco_email/unsubscribes/_table.haml
|
|
452
452
|
- config/initializers/assets.rb
|
|
453
453
|
- config/routes.rb
|
|
454
|
-
- config/trash/credentials.yml.enc
|
|
455
454
|
- lib/tasks/bjjcollective/sitemap.rb
|
|
456
455
|
- lib/tasks/db_tasks.rake
|
|
457
456
|
- lib/tasks/direct_mail_tasks.rake
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
WHqoOCnqWBlZw7b6AEldEVt6/kukDrxD2tep9qvR7l7+GMGiBSSIXpcUu8jR5pO2raAtgkyCFgTe5gcy/AHWXSeHWZXV+4Af7Yuu1SZd0TohrbDMdTwoTa3dqVTxi0rJ2XEcHX6balRTA2xDdYluOGKE+ZRjw9ISXdBcmPVyass6A3Alq/Drpn2qH+xGoEORXl6aup3dPEQXNeZke94qmOy4b2Bu4xbK+D6ef1KYfiFyOD6ZCC6LhOp3hYD5id64e6ztIxxjYDhfodoez5ShpdG94QQxwf3IYvRw360MpCYoADhfNqWjDle+U7vSirVjS2cvI6kM5J5a8Rqiyl/hlGZAhlRrR2kCPO8Y7uUVltioGjAful0G8TuCmBqVvkyCDmCQOIy8PR5d4lFmCC836Wq5+xCrhx94HRBO--R2UXrOlTjc009hgy--wRmj1n2ydKGptUJ3j+E+0g==
|