@@ -6,6 +6,7 @@ class DiagramsController < ApplicationController |
||
| 6 | 6 |
else |
| 7 | 7 |
agents = current_user.agents |
| 8 | 8 |
end |
| 9 |
+ @disabled_agents = agents.inactive |
|
| 9 | 10 |
agents = agents.active unless params[:include_disabled].present? |
| 10 | 11 |
@agents = agents.includes(:receivers) |
| 11 | 12 |
end |
@@ -60,7 +60,8 @@ class Agent < ActiveRecord::Base |
||
| 60 | 60 |
has_many :scenario_memberships, :dependent => :destroy, :inverse_of => :agent |
| 61 | 61 |
has_many :scenarios, :through => :scenario_memberships, :inverse_of => :agents |
| 62 | 62 |
|
| 63 |
- scope :active, -> { where(disabled: false) }
|
|
| 63 |
+ scope :active, -> { where(disabled: false) }
|
|
| 64 |
+ scope :inactive, -> { where(disabled: true) }
|
|
| 64 | 65 |
|
| 65 | 66 |
scope :of_type, lambda { |type|
|
| 66 | 67 |
type = case type |
@@ -11,9 +11,9 @@ |
||
| 11 | 11 |
<div class="btn-group"> |
| 12 | 12 |
<%= link_to icon_tag('glyphicon-chevron-left') + ' Back'.html_safe, (@scenario ? scenario_path(@scenario) : agents_path), class: "btn btn-default" %>
|
| 13 | 13 |
<% if params[:include_disabled] %> |
| 14 |
- <%= link_to @scenario ? scenario_diagram_path(@scenario) : diagram_path, class: 'btn btn-default' do %><%= icon_tag('glyphicon-eye-close') %> Hide disabled Agents<% end %>
|
|
| 14 |
+ <%= link_to @scenario ? scenario_diagram_path(@scenario) : diagram_path, class: 'btn btn-default' do %><%= icon_tag('glyphicon-eye-close') %> Hide <%= pluralize(@disabled_agents.count, 'disabled Agent') %><% end %>
|
|
| 15 | 15 |
<% else %> |
| 16 |
- <%= link_to @scenario ? scenario_diagram_path(@scenario, include_disabled: true) : diagram_path(include_disabled: true), class: 'btn btn-default' do %><%= icon_tag('glyphicon-eye-open') %> Show disabled Agents<% end %>
|
|
| 16 |
+ <%= link_to @scenario ? scenario_diagram_path(@scenario, include_disabled: true) : diagram_path(include_disabled: true), class: 'btn btn-default' do %><%= icon_tag('glyphicon-eye-open') %> Show <%= pluralize(@disabled_agents.count, 'disabled Agent') %><% end %>
|
|
| 17 | 17 |
<% end %> |
| 18 | 18 |
</div> |
| 19 | 19 |
|