Merge branch 'caching' into develop

10 files changed, 131 insertions, 182 deletions

diff --git a/app/models/automatic_call_distributor.rb b/app/models/automatic_call_distributor.rb
index cd887d5..a34392e 100644
--- a/app/models/automatic_call_distributor.rb
+++ b/app/models/automatic_call_distributor.rb
@@ -1,7 +1,7 @@
 class AutomaticCallDistributor < ActiveRecord::Base
   attr_accessible :uuid, :name, :strategy, :automatic_call_distributorable_type, :automatic_call_distributorable_id, :max_callers, :agent_timeout, :retry_timeout, :join, :leave, :gs_node_id, :announce_position, :announce_call_agents, :greeting, :goodbye, :music
 
-  belongs_to :automatic_call_distributorable, :polymorphic => true
+  belongs_to :automatic_call_distributorable, :polymorphic => true, :touch => true
 
   has_many :acd_agents, :dependent => :destroy
   has_many :phone_numbers, :as => :phone_numberable, :dependent => :destroy
diff --git a/app/models/callthrough.rb b/app/models/callthrough.rb
index c057fa6..ae461cf 100644
--- a/app/models/callthrough.rb
+++ b/app/models/callthrough.rb
@@ -5,7 +5,7 @@ class Callthrough < ActiveRecord::Base
 
   # Validations and Associations
   #
-  belongs_to :tenant
+  belongs_to :tenant, :touch => true
 
   validates_presence_of :tenant_id
   validates_presence_of :tenant
diff --git a/app/models/conference.rb b/app/models/conference.rb
index 16b646c..8c5a752 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -3,7 +3,7 @@ class Conference < ActiveRecord::Base
                   :open_for_anybody, :max_members, :announce_new_member_by_name,
                   :announce_left_member_by_name
   
-  belongs_to :conferenceable, :polymorphic => true
+  belongs_to :conferenceable, :polymorphic => true, :touch => true
   has_many :conference_invitees, :dependent => :destroy
   has_many :phone_numbers, :as => :phone_numberable, :dependent => :destroy
 
diff --git a/app/models/hunt_group.rb b/app/models/hunt_group.rb
index 184297c..5011bf0 100644
--- a/app/models/hunt_group.rb
+++ b/app/models/hunt_group.rb
@@ -1,7 +1,7 @@
 class HuntGroup < ActiveRecord::Base
   attr_accessible :name, :strategy, :seconds_between_jumps, :phone_numbers_attributes
 
-  belongs_to :tenant
+  belongs_to :tenant, :touch => true
   has_many :call_forwards, :as => :call_forwardable, :dependent => :destroy
 
   validates_uniqueness_of :name, :scope => :tenant_id,
diff --git a/app/models/phone_book.rb b/app/models/phone_book.rb
index 3603eae..21d30c0 100644
--- a/app/models/phone_book.rb
+++ b/app/models/phone_book.rb
@@ -1,7 +1,7 @@
 class PhoneBook < ActiveRecord::Base
   attr_accessible :name, :description, :uuid
   
-  belongs_to :phone_bookable, :polymorphic => true
+  belongs_to :phone_bookable, :polymorphic => true, :touch => true
   has_many :phone_book_entries, :dependent => :destroy
   
   validates_presence_of :name
diff --git a/app/views/gs_parameters/index.html.haml b/app/views/gs_parameters/index.html.haml
index 3c16806..b4a53e8 100644
--- a/app/views/gs_parameters/index.html.haml
+++ b/app/views/gs_parameters/index.html.haml
@@ -1,7 +1,7 @@
 - title t("gs_parameters.index.page_title")
 
 - if @gs_parameters && @gs_parameters.count > 0
-  - cache([@ps_parameters_unordered.order(:updated_at).last, @ps_parameters_unordered.pluck(:id)]) do
+  - cache([@ps_parameters_unordered.order(:updated_at).last, @ps_parameters_unordered.count]) do
     - if @sections
       %table
         - @sections.each do |section|
diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml
index 3c9440b..c3411bc 100644
--- a/app/views/tenants/_admin_area.de.html.haml
+++ b/app/views/tenants/_admin_area.de.html.haml
@@ -1,95 +1,35 @@
-%p
-  Sie sind Mitglied der  
-  = link_to 'Admin Gruppe', tenant_user_group_path(@tenant, @tenant.user_groups.find_by_name('Admins'))
-  und haben deshalb besondere Rechte. Aber wie Peter Parker schon sagte: "With great power comes great responsibility."
+- cache([I18n.locale, @tenant, UserGroup.count, UserGroup.order(:updated_at).last, User.count, User.order(:updated_at).last, Manufacturer.count, Manufacturer.order(:updated_at).last, PhoneModel.count]) do
+  %p
+    Sie sind Mitglied der  
+    = link_to 'Admin Gruppe', tenant_user_group_path(@tenant, @tenant.user_groups.find_by_name('Admins'))
+    und haben deshalb besondere Rechte. Aber wie Peter Parker schon sagte: "With great power comes great responsibility."
 
-%p
-  Dieser Mandant hat  
-  = link_to pluralize(@tenant.user_groups.count, 'user group'), tenant_user_groups_path(@tenant)
-  - if @tenant.user_groups.count < 5
-    = "(#{@tenant.user_groups.order(:name).map{|group| group.to_s }.join(', ')})"
-  die in Summe 
-  = link_to pluralize(@tenant.users.count, 'user'), tenant_users_path(@tenant)
-  verwalten.
-  Das System kann  
-  = PhoneModel.count
-  verschiedene Telefonmodelle von den folgenden Herstellern verwalten:  
-  - Manufacturer.all.each do |manufacturer|
-    - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last
-      = succeed ', ' do
-        =link_to manufacturer, manufacturer_path(manufacturer)
-    - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last
-      = succeed ' und ' do
-        =link_to manufacturer, manufacturer_path(manufacturer)
-    - else
-      = succeed '.' do
-        =link_to manufacturer, manufacturer_path(manufacturer)
+  %p
+    = @tenant
+    hat  
+    = link_to pluralize(@tenant.user_groups.count, 'user group'), tenant_user_groups_path(@tenant)
+    - if @tenant.user_groups.count < 5
+      = "(#{@tenant.user_groups.order(:name).map{|group| group.to_s }.join(', ')})"
+    die in Summe 
+    = link_to pluralize(@tenant.users.count, 'user'), tenant_users_path(@tenant)
+    verwalten.
+    Das System kann  
+    = PhoneModel.count
+    verschiedene Telefonmodelle von den folgenden Herstellern verwalten:  
+    - Manufacturer.all.each do |manufacturer|
+      - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last
+        = succeed ', ' do
+          =link_to manufacturer, manufacturer_path(manufacturer)
+      - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last
+        = succeed ' und ' do
+          =link_to manufacturer, manufacturer_path(manufacturer)
+      - else
+        = succeed '.' do
+          =link_to manufacturer, manufacturer_path(manufacturer)
 
 = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant}
 
-%h3 Allgemein
+= render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant}
 
-%table
-  %tr{:class => 'even'}
-    %th
-      Funktion
-    %th
-      Anzahl
-    %th
-  %tr{:class => 'odd'}
-    %td
-      Callthrough
-    %td
-      = link_to @tenant.callthroughs.count.to_s, tenant_callthroughs_path(@tenant)
-    %td
-      = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => Callthrough}
-  %tr{:class => 'even'}
-    %td
-      Konferenzen
-    %td
-      = link_to @tenant.conferences.count.to_s, tenant_conferences_path(@tenant)
-    %td
-      = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => Conference}
-  %tr{:class => 'odd'}
-    %td
-      Rufgruppen
-    %td
-      = link_to @tenant.hunt_groups.count.to_s, tenant_hunt_groups_path(@tenant)
-    %td
-      = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => HuntGroup}
-  %tr{:class => 'even'}
-    %td
-      Warteschleifen
-    %td
-      = link_to @tenant.automatic_call_distributors.count.to_s, tenant_automatic_call_distributors_path(@tenant)
-    %td
-      = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => AutomaticCallDistributor}
-  %tr{:class => 'odd'}
-    %td
-      Oberflächen-Funktionen
-    %td
-      = link_to GuiFunction.count.to_s, gui_functions_path
-    %td
+= render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant}
 
--# Phone books
--#
-- if GuiFunction.display?('show_phone_books_in_user_show_view', current_user)
-  - if can?( :index, PhoneBook )
-    %h2=t("phone_books.index.page_title")
-    = render "phone_books/index_core", :phone_books => @tenant.phone_books
-    = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => PhoneBook}    
-
-- if GsParameter.get('STRICT_INTERNAL_EXTENSION_HANDLING') == true
-  %h3= t('phone_number_ranges.index.page_title')
-
-  - if @tenant.created_at > (Time.now - 15.minutes) && Delayed::Job.count > 0 && @tenant.phone_number_ranges.find_by_name(GsParameter.get('INTERNAL_EXTENSIONS')).try(:phone_numbers).try(:count).to_i == 0
-    Der Mandant 
-    = "\"#{@tenant}\""
-    wurde erst vor 
-    = distance_of_time_in_words_to_now(@tenant.created_at)
-    erstellt. Es gibt immer noch nicht abgeschlossene
-    = pluralize(Delayed::Job.count, 'Hintergrundprozesse')
-    \. Bitte warten Sie noch ein paar Minuten und laden anschließend diese Seite erneut.
-  - else
-    =render 'phone_number_ranges/index_core', :phone_number_ranges => (@tenant.phone_number_ranges + @tenant.country.phone_number_ranges.where(:name => GsParameter.get('SERVICE_NUMBERS')))
-    =render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => PhoneNumberRange}
diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml
index c838a18..56b0820 100644
--- a/app/views/tenants/_admin_area.html.haml
+++ b/app/views/tenants/_admin_area.html.haml
@@ -1,93 +1,34 @@
-%p
-  You belong to the 
-  = link_to 'admin group', tenant_user_group_path(@tenant, @tenant.user_groups.find_by_name('Admins'))
-  and therefore have super powers. But always remember Peter Parker's: "With great power comes great responsibility."
+- cache([I18n.locale, @tenant, UserGroup.count, UserGroup.order(:updated_at).last, User.count, User.order(:updated_at).last, Manufacturer.count, Manufacturer.order(:updated_at).last, PhoneModel.count]) do
+  %p
+    You belong to the 
+    = link_to 'admin group', tenant_user_group_path(@tenant, @tenant.user_groups.find_by_name('Admins'))
+    and therefore have super powers. But always remember Peter Parker's: "With great power comes great responsibility."
 
-%p
-  = succeed '.' do
-    This tenant has 
-    = link_to pluralize(@tenant.user_groups.count, 'user group'), tenant_user_groups_path(@tenant)
-    - if @tenant.user_groups.count < 5
-      = "(#{@tenant.user_groups.order(:name).map{|group| group.to_s }.join(', ')})"
-    which handle a total of 
-    = link_to pluralize(@tenant.users.count, 'user'), tenant_users_path(@tenant)
-  This system can setup 
-  = PhoneModel.count
-  different phone models from the manufacturers 
-  - Manufacturer.all.each do |manufacturer|
-    - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last
-      = succeed ', ' do
-        =link_to manufacturer, manufacturer_path(manufacturer)
-    - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last
-      = succeed ' and ' do
-        =link_to manufacturer, manufacturer_path(manufacturer)
-    - else
-      = succeed '.' do
-        =link_to manufacturer, manufacturer_path(manufacturer)
+  %p
+    = succeed '.' do
+      This tenant has 
+      = link_to pluralize(@tenant.user_groups.count, 'user group'), tenant_user_groups_path(@tenant)
+      - if @tenant.user_groups.count < 5
+        = "(#{@tenant.user_groups.order(:name).map{|group| group.to_s }.join(', ')})"
+      which handle a total of 
+      = link_to pluralize(@tenant.users.count, 'user'), tenant_users_path(@tenant)
+    This system can setup 
+    = PhoneModel.count
+    different phone models from the manufacturers 
+    - Manufacturer.all.each do |manufacturer|
+      - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last
+        = succeed ', ' do
+          =link_to manufacturer, manufacturer_path(manufacturer)
+      - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last
+        = succeed ' and ' do
+          =link_to manufacturer, manufacturer_path(manufacturer)
+      - else
+        = succeed '.' do
+          =link_to manufacturer, manufacturer_path(manufacturer)
 
 = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant}
 
-%h3 Misc
+= render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant}
 
-%table
-  %tr{:class => 'even'}
-    %th
-      Feature
-    %th
-      Counter
-    %th
-  %tr{:class => 'odd'}
-    %td
-      Callthroughs
-    %td
-      = link_to @tenant.callthroughs.count.to_s, tenant_callthroughs_path(@tenant)
-    %td
-      = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => Callthrough}
-  %tr{:class => 'even'}
-    %td
-      Conferences
-    %td
-      = link_to @tenant.conferences.count.to_s, tenant_conferences_path(@tenant)
-    %td
-      = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => Conference}
-  %tr{:class => 'odd'}
-    %td
-      Hunt groups
-    %td
-      = link_to @tenant.hunt_groups.count.to_s, tenant_hunt_groups_path(@tenant)
-    %td
-      = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => HuntGroup}
-  %tr{:class => 'even'}
-    %td
-      ACDs
-    %td
-      = link_to @tenant.automatic_call_distributors.count.to_s, tenant_automatic_call_distributors_path(@tenant)
-    %td
-      = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => AutomaticCallDistributor}
-  %tr{:class => 'odd'}
-    %td
-      GUI functions
-    %td
-      = link_to GuiFunction.count.to_s, gui_functions_path
-    %td
+= render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant}
 
--# Phone books
--#
-- if GuiFunction.display?('show_phone_books_in_user_show_view', current_user)
-  - if can?( :index, PhoneBook )
-    %h2=t("phone_books.index.page_title")
-    = render "phone_books/index_core", :phone_books => @tenant.phone_books
-    = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => PhoneBook} 
-
-- if GsParameter.get('STRICT_INTERNAL_EXTENSION_HANDLING') == true
-  %h3= t('phone_number_ranges.index.page_title')
-
-  - if @tenant.created_at > (Time.now - 15.minutes) && Delayed::Job.count > 0 && @tenant.phone_number_ranges.find_by_name(GsParameter.get('INTERNAL_EXTENSIONS')).try(:phone_numbers).try(:count).to_i == 0
-    This tenant was created 
-    = distance_of_time_in_words_to_now(@tenant.created_at)
-    ago. There are still 
-    = pluralize(Delayed::Job.count, 'background job')
-    not finished. This can take a couple of minutes. Please reload this page later.
-  - else
-    =render 'phone_number_ranges/index_core', :phone_number_ranges => (@tenant.phone_number_ranges + @tenant.country.phone_number_ranges.where(:name => GsParameter.get('SERVICE_NUMBERS')))
-    =render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => PhoneNumberRange}
diff --git a/app/views/tenants/_table_of_functions.html.haml b/app/views/tenants/_table_of_functions.html.haml
new file mode 100644
index 0000000..d4d3950
--- /dev/null
+++ b/app/views/tenants/_table_of_functions.html.haml
@@ -0,0 +1,60 @@
+- cache([I18n.locale, tenant, GuiFunction.count, GuiFunction.order(:updated_at).last, GsParameter.count, GsParameter.order(:updated_at)]) do
+  %table
+    %tr{:class => 'even'}
+      %th
+        Funktion
+      %th
+        Anzahl
+      %th
+    %tr{:class => 'odd'}
+      %td
+        = t("callthroughs.name")
+      %td
+        - if tenant.callthroughs.any?
+          = link_to tenant.callthroughs.count.to_s, tenant_callthroughs_path(tenant)
+        - else
+          = '-'
+      %td
+        = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Callthrough}
+    %tr{:class => 'even'}
+      %td
+        = t("conferences.name")
+      %td
+        - if tenant.conferences.any?
+          = link_to tenant.conferences.count.to_s, tenant_conferences_path(tenant)
+        - else
+          = '-'
+      %td
+        = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Conference}
+    %tr{:class => 'odd'}
+      %td
+        = t("hunt_groups.name")
+      %td
+        - if tenant.hunt_groups.any?
+          = link_to tenant.hunt_groups.count.to_s, tenant_hunt_groups_path(tenant)
+        - else
+          = '-'
+      %td
+        = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => HuntGroup}
+    %tr{:class => 'even'}
+      %td
+        = t("automatic_call_distributors.name")
+      %td
+        - if tenant.automatic_call_distributors.any?
+          = link_to tenant.automatic_call_distributors.count.to_s, tenant_automatic_call_distributors_path(tenant)
+        - else
+          = '-'
+      %td
+        = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => AutomaticCallDistributor}
+    %tr{:class => 'odd'}
+      %td
+        = t("gui_functions.name")
+      %td
+        = link_to GuiFunction.count.to_s, gui_functions_path
+      %td
+    %tr{:class => 'even'}
+      %td
+        = t("gs_parameters.name")
+      %td
+        = link_to GsParameter.count.to_s, gs_parameters_path
+      %td
\ No newline at end of file
diff --git a/app/views/tenants/_table_of_phone_books.html.haml b/app/views/tenants/_table_of_phone_books.html.haml
new file mode 100644
index 0000000..ef118c7
--- /dev/null
+++ b/app/views/tenants/_table_of_phone_books.html.haml
@@ -0,0 +1,8 @@
+- cache([I18n.locale, tenant]) do
+  -# Phone books
+  -#
+  - if GuiFunction.display?('show_phone_books_in_user_show_view', current_user)
+    - if can?( :index, PhoneBook )
+      %h2=t("phone_books.index.page_title")
+      = render "phone_books/index_core", :phone_books => tenant.phone_books
+      = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => PhoneBook}
\ No newline at end of file