summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-20 20:01:06 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-20 20:01:06 +0100
commitfe5b9f2c046561f9918a5660b4a5193ef66fd3aa (patch)
tree1bee6ec86e0425cd73b2415ce6282d96d848daea /app
parent23a9f6fd67a61d4230e77497b57d0f70c8a0d8ef (diff)
Replaced some order with reorder within cache key generation.
Diffstat (limited to 'app')
-rw-r--r--app/views/gs_parameters/index.html.haml2
-rw-r--r--app/views/tenants/_gs_parameter_table.html.haml6
-rw-r--r--app/views/tenants/_table_of_functions.html.haml10
-rw-r--r--app/views/users/_index_core.html.haml2
4 files changed, 10 insertions, 10 deletions
diff --git a/app/views/gs_parameters/index.html.haml b/app/views/gs_parameters/index.html.haml
index 37fe825..3844c3d 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(['gs_parameters_table', I18n.locale, @gs_parameters_unordered.order(:updated_at).last, @gs_parameters_unordered.count]) do
+ - cache(['gs_parameters_table', I18n.locale, @gs_parameters_unordered.reorder(:updated_at).last, @gs_parameters_unordered.count]) do
- if @sections
%table
- @sections.each do |section|
diff --git a/app/views/tenants/_gs_parameter_table.html.haml b/app/views/tenants/_gs_parameter_table.html.haml
index 3af06cf..94c44e5 100644
--- a/app/views/tenants/_gs_parameter_table.html.haml
+++ b/app/views/tenants/_gs_parameter_table.html.haml
@@ -1,4 +1,4 @@
-- cache(['gs_parameters_tenant_overview_table', I18n.locale, tenant, GuiFunction.count, GuiFunction.order(:updated_at).last, GsParameter.count, GsParameter.order(:updated_at).last]) do
+- cache(['gs_parameters_tenant_overview_table', I18n.locale, tenant, GuiFunction.count, GuiFunction.reorder(:updated_at).last, GsParameter.count, GsParameter.reorder(:updated_at).last]) do
%table
%tr{:class => 'even'}
%th
@@ -14,11 +14,11 @@
%td
= link_to GuiFunction.count.to_s, gui_functions_path
%td
- = l GuiFunction.order(:updated_at).last.updated_at, :format => :short
+ = l GuiFunction.reorder(:updated_at).last.updated_at, :format => :short
%tr{:class => 'even'}
%td
= t("gs_parameters.name")
%td
= link_to GsParameter.count.to_s, gs_parameters_path
%td
- = l GsParameter.order(:updated_at).last.updated_at, :format => :short
+ = l GsParameter.reorder(:updated_at).last.updated_at, :format => :short
diff --git a/app/views/tenants/_table_of_functions.html.haml b/app/views/tenants/_table_of_functions.html.haml
index 75b2332..957687b 100644
--- a/app/views/tenants/_table_of_functions.html.haml
+++ b/app/views/tenants/_table_of_functions.html.haml
@@ -1,4 +1,4 @@
-- cache(['table_of_pbx_features', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.order(:updated_at).last, tenant.conferences.count, tenant.conferences.order(:updated_at).last, tenant.hunt_groups.count, tenant.hunt_groups.order(:updated_at).last, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.order(:updated_at).last]) do
+- cache(['table_of_pbx_features', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.reorder(:updated_at).last, tenant.conferences.count, tenant.conferences.reorder(:updated_at).last, tenant.hunt_groups.count, tenant.hunt_groups.reorder(:updated_at).last, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.reorder(:updated_at).last]) do
%table
%tr{:class => 'even'}
%th
@@ -6,7 +6,7 @@
%th
Anzahl
%th
- - cache(['table_of_pbx_features_callthroughs_row', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.order(:updated_at).last]) do
+ - cache(['table_of_pbx_features_callthroughs_row', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.reorder(:updated_at).last]) do
%tr{:class => 'odd'}
%td
= t("callthroughs.name")
@@ -17,7 +17,7 @@
= '-'
%td
= render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Callthrough}
- - cache(['table_of_pbx_features_conferences_row', I18n.locale, tenant, tenant.conferences.count, tenant.conferences.order(:updated_at).last]) do
+ - cache(['table_of_pbx_features_conferences_row', I18n.locale, tenant, tenant.conferences.count, tenant.conferences.reorder(:updated_at).last]) do
%tr{:class => 'even'}
%td
= t("conferences.name")
@@ -28,7 +28,7 @@
= '-'
%td
= render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Conference}
- - cache(['table_of_pbx_features_hunt_groups_row', I18n.locale, tenant, tenant.hunt_groups.count, tenant.hunt_groups.order(: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]) do
%tr{:class => 'odd'}
%td
= t("hunt_groups.name")
@@ -39,7 +39,7 @@
= '-'
%td
= render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => HuntGroup}
- - cache(['table_of_pbx_features_automatic_call_distributors_row', I18n.locale, tenant, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.order(:updated_at).last]) do
+ - cache(['table_of_pbx_features_automatic_call_distributors_row', I18n.locale, tenant, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.reorder(:updated_at).last]) do
%tr{:class => 'even'}
%td
= t("automatic_call_distributors.name")
diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml
index 9376826..5f0cb41 100644
--- a/app/views/users/_index_core.html.haml
+++ b/app/views/users/_index_core.html.haml
@@ -1,4 +1,4 @@
-- cache(['user_table_row_inner_td', I18n.locale, current_user, users.order(:updated_at).last, users.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do
+- cache(['user_table_row_inner_td', I18n.locale, current_user, users.reorder(:updated_at).last, users.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do
%table
%tr
%th