Merge branch 'reorder' into develop

2 files changed, 8 insertions, 8 deletions

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")