From c5b10519dd1ade04a25c43b100c15deb7e39b6d0 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Feb 2013 15:07:23 +0100
Subject: Added entity in the table. But it's fare from pretty. #136

---
 app/views/gs_parameters/_index_core.html.haml | 14 ++++++++++++--
 app/views/gs_parameters/index.html.haml       | 12 +++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/views/gs_parameters/_index_core.html.haml b/app/views/gs_parameters/_index_core.html.haml
index 11d60db..2105126 100644
--- a/app/views/gs_parameters/_index_core.html.haml
+++ b/app/views/gs_parameters/_index_core.html.haml
@@ -1,6 +1,9 @@
-- cache(['gs_parameters_table_section', gs_parameters.first.section, gs_parameters.reorder(:updated_at).last, gs_parameters.pluck(:id)]) do
+- cache(['gs_parameter_sub_table', I18n.locale, gs_parameters.count, gs_parameters.reorder(:updated_at).first, gs_parameters.reorder(:updated_at).last]) do
   %thead
     %tr
+      %th
+        %span.hidden-phone
+          = t('gs_parameters.index.entity')
       %th= t('gs_parameters.index.name')
       - if !@sections
         %th= t('gs_parameters.index.section')
@@ -8,8 +11,15 @@
 
   %tbody
     - for gs_parameter in gs_parameters
-      - cache(['gs_parameters_table_single_row', gs_parameter]) do 
+      - cache(['gs_parameters_table_single_row', I18n.locale, gs_parameter]) do 
         %tr
+          %td
+            - if gs_parameter.entity.blank?
+              %span.hidden-phone
+                = '-'
+            - else
+              %span.hidden-phone
+                = truncate(gs_parameter.entity, :length => GsParameter.get('DESKTOP_MAX_STRING_LENGTH'))       
           %td
             %span.hidden-phone
               = truncate(gs_parameter.name, :length => GsParameter.get('DESKTOP_MAX_STRING_LENGTH'))
diff --git a/app/views/gs_parameters/index.html.haml b/app/views/gs_parameters/index.html.haml
index 1189a45..8df2bb3 100644
--- a/app/views/gs_parameters/index.html.haml
+++ b/app/views/gs_parameters/index.html.haml
@@ -1,13 +1,11 @@
 - content_for :title, t("gs_parameters.index.page_title")
 
-- if @gs_parameters && @gs_parameters.count > 0
-  - cache(['gs_parameters_table', I18n.locale, @gs_parameters_unordered.reorder(:updated_at).last, @gs_parameters_unordered.count]) do
+- cache(['gs_parameter_all_tables', I18n.locale, @gs_parameters.count, @gs_parameters.reorder(:updated_at).first, @gs_parameters.reorder(:updated_at).last]) do
+  - if @gs_parameters && @gs_parameters.count > 0
     - if @sections
-      %table.table.table-striped
-        - @sections.each do |section|
-          %tr
-            %td{:colspan => 3}
-              %h3= section
+      - @sections.each do |section|
+        %h3= section
+        %table.table.table-striped
           -# Template Dependency: gs_parameters/_index_core 
           = render "index_core", :gs_parameters => @gs_parameters.where(:section => section)
     - else
-- 
cgit v1.2.3