ish_manager 0.1.8.475 → 0.1.8.477

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/ish_manager/email_conversations_controller.rb +7 -7
  3. data/app/controllers/ish_manager/leads_controller.rb +5 -4
  4. data/app/views/ish_manager/email_conversations/index.haml +12 -11
  5. data/app/views/ish_manager/leads/show.haml +3 -5
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b0745f9f4eb8cc5c261f4b68f5048a83dd168225157da0d302112a8368d8fc47
4
- data.tar.gz: 6382edc9a7074c39ea8be58196a21514332dc1d7b9d95b25cecd449ba95d6bea
3
+ metadata.gz: ac7e539ba1bb1c2598f1a4ffbc9f8cea2dcc5ba2af28bf15bad84d2b64214049
4
+ data.tar.gz: e973caac62d81710c2797127f01cabb457fb298b1c52df27e3abfdbd79816a39
5
5
  SHA512:
6
- metadata.gz: 4ea6e1c87c80facfc4b8eaebe97f068ee529568f3256211175e27cab0ddb14f838d4741ba7dae33ec1608e1ccf9e145e3a6a78f657e50d881e29257d9cd83e44
7
- data.tar.gz: 27aa93073a85328e1bd0e6f5e290a1033dbdc25c22736d8726515c3b5c4aca4336d92297d71d45aa9d02ff1467ae7af6551bf61e3f028fe6de5624f6938cbbb6
6
+ metadata.gz: 50b0a8b487cc60ccbc1099d62a314dea533d0ca65f07346d9c27a44f2bfd0705dc97ceb83b4c28e4e2bc65c02d38721db85706c801a912c6185cadfa3fdb9f1b
7
+ data.tar.gz: f6e13435e0d9f8160be14732f06f905259e66c0e6067144fc2eeb5f4eeda2cd28cad6e5ae2d9057df225ba5160a42845995de791af809aa74c9008ab26f9363f
data/app/controllers/ish_manager/email_conversations_controller.rb CHANGED
@@ -7,12 +7,12 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
7
7
  authorize! :email_conversations_index, IshManager::Ability
8
8
  @email_conversations = ::Office::EmailConversation.all
9
9
 
10
- if current_profile.per_page > 100
11
- flash_notice "Cannot display more than 100 conversations per page."
12
- per_page = 100
13
- else
14
- per_page = current_profile.per_page
15
- end
10
+ # if current_profile.per_page > 100
11
+ # flash_notice "Cannot display more than 100 conversations per page."
12
+ # per_page = 100
13
+ # else
14
+ # per_page = current_profile.per_page
15
+ # end
16
16
 
17
17
  if params[:slug]
18
18
  @email_conversations = @email_conversations.in_emailtag( params[:slug] )
@@ -32,7 +32,7 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
32
32
  def show
33
33
  authorize! :email_conversations_show, IshManager::Ability
34
34
  @email_conversation = ::Office::EmailConversation.find( params[:id] )
35
- @email_messages = @email_conversation.email_messages.order_by( date: :asc )
35
+ @email_messages = @email_conversation.email_messages.order_by( date: :asc )
36
36
  @email_conversation.update_attributes({ state: Conv::STATE_READ })
37
37
  end
38
38
 
data/app/controllers/ish_manager/leads_controller.rb CHANGED
@@ -132,11 +132,12 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
132
132
  end
133
133
 
134
134
  def show
135
- @lead = Lead.find params[:id]
135
+ @lead = Lead.find params[:id]
136
136
  authorize! :show, @lead
137
- @schs = Sch.where( lead_id: @lead.id )
138
- @ctxs = Ctx.where( lead_id: @lead.id )
139
- @msgs = Msg.where( from: @lead.email )
137
+ @schs = Sch.where( lead_id: @lead.id )
138
+ @ctxs = Ctx.where( lead_id: @lead.id )
139
+ @convs = Conv.find( Office::EmailConversationLead.where( lead_id: @lead.id ).map( &:email_conversation_id ) )
140
+ @msgs = Msg.where( from: @lead.email )
140
141
  @galleries = @lead.galleries.page( params[:galleries_page] ).per( current_profile.per_page )
141
142
  @videos = @lead.videos.page( params[:videos_page] ).per( current_profile.per_page )
142
143
  end
data/app/views/ish_manager/email_conversations/index.haml CHANGED
@@ -34,17 +34,18 @@
34
34
  %br
35
35
  = render 'paginate', resource: @email_conversations, param_name: :conv_page, views_prefix: :ish_manager
36
36
 
37
- %table.conversations.bordered
38
- %tr
39
- %th
40
- .chip.select-all
41
- = check_box_tag :select_all
42
- .n-selected -
43
- %th Msgs
44
- %th From emails
45
- %th Subject
46
- %th Datetime
47
- %th Tags
37
+ %table.conversations.bordered.data-table
38
+ %thead
39
+ %tr
40
+ %th
41
+ .chip.select-all
42
+ = check_box_tag :select_all
43
+ .n-selected -
44
+ %th Msgs
45
+ %th From emails
46
+ %th Subject
47
+ %th Datetime
48
+ %th Tags
48
49
 
49
50
  - @email_conversations.each do |conv|
50
51
  %tr{ class: [ conv.state ] }
data/app/views/ish_manager/leads/show.haml CHANGED
@@ -71,13 +71,11 @@
71
71
 
72
72
  .row
73
73
  .col-md-12.msgs
74
- %h5 Email Messages (#{@msgs.length})
75
- .descr @TODO: these used to be links, but now they are broken. _vp_ 2023-08-10
74
+ %h5 Email Conversations (#{@convs.length})
76
75
  %ul
77
- - @msgs.each do |msg|
76
+ - @convs.each do |conv|
78
77
  %li
79
- = msg.subject
80
- -# = link_to msg.subject, email_conversation_path( msg.conv )
78
+ = link_to conv.subject, email_conversation_path( conv )
81
79
 
82
80
  .row
83
81
  .col-md-6
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ish_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.475
4
+ version: 0.1.8.477
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-09-23 00:00:00.000000000 Z
11
+ date: 2023-09-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails