diff options
author | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
---|---|---|
committer | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
commit | 4fcdd330139921b6fa5d4f9d15fb5f91775b27af (patch) | |
tree | 62e82c385c9a804a8f32da6f276881ff8c21fc90 /app/views/tenants | |
parent | 2b94b16ee1201d15b3b9d66e142df311141a47db (diff) | |
parent | a865b1f9506b900ed8643c01d94c86268e907720 (diff) |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'app/views/tenants')
-rw-r--r-- | app/views/tenants/_table_of_automatic_call_distributors.html.haml | 2 | ||||
-rw-r--r-- | app/views/tenants/_table_of_hunt_groups.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/tenants/_table_of_automatic_call_distributors.html.haml b/app/views/tenants/_table_of_automatic_call_distributors.html.haml index 22796af..c3ab309 100644 --- a/app/views/tenants/_table_of_automatic_call_distributors.html.haml +++ b/app/views/tenants/_table_of_automatic_call_distributors.html.haml @@ -1,4 +1,4 @@ -- cache(['tenant_show_table_of_automatic_call_distributors', I18n.locale, tenant, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.reorder(:updated_at).last]) do +- cache(['tenant_show_table_of_automatic_call_distributors', I18n.locale, tenant, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.reorder(:updated_at).last, PhoneNumber.where(:phone_numberable_type => 'AutomaticCallDistributor').order(:updated_at).last]) do -# AutomaticCallDistributors -# - if (can?( :index, AutomaticCallDistributor ) && tenant.automatic_call_distributors.count > 0 ) || can?( :create, AutomaticCallDistributor ) diff --git a/app/views/tenants/_table_of_hunt_groups.html.haml b/app/views/tenants/_table_of_hunt_groups.html.haml index aca570d..d93ebe6 100644 --- a/app/views/tenants/_table_of_hunt_groups.html.haml +++ b/app/views/tenants/_table_of_hunt_groups.html.haml @@ -1,4 +1,4 @@ -- cache(['table_of_pbx_features_hunt_groups_row', I18n.locale, tenant, tenant.hunt_groups.count, tenant.hunt_groups.reorder(:updated_at).last]) do +- cache(['table_of_pbx_features_hunt_groups_row', I18n.locale, tenant, tenant.hunt_groups.count, tenant.hunt_groups.reorder(:updated_at).last, PhoneNumber.where(:phone_numberable_type => 'HuntGroup').order(:updated_at).last]) do -# HuntGroups -# - if (can?( :index, HuntGroup ) && tenant.hunt_groups.count > 0 ) || can?( :create, HuntGroup ) |