aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2017-04-10 15:48:48 +0200
committerjpl2017-04-10 15:48:48 +0200
commit56ed738edca216527f53b4389ad2555eb7abe37a (patch)
tree73872bf075322810bb9f0e295477830ace522cd8
parent19127ebb18ee3f068ff686bf21bad7472f493186 (diff)
downloadchouette-core-56ed738edca216527f53b4389ad2555eb7abe37a.tar.bz2
Refs #2909: updating table builder
-rw-r--r--app/helpers/newapplication_helper.rb2
-rw-r--r--app/views/time_tables/index.html.slim4
2 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/newapplication_helper.rb b/app/helpers/newapplication_helper.rb
index acb21f34a..ca6ded5f6 100644
--- a/app/helpers/newapplication_helper.rb
+++ b/app/helpers/newapplication_helper.rb
@@ -16,7 +16,7 @@ module NewapplicationHelper
end
columns.map do |k, v|
- if ["ID Codif", "Oid", "OiD", "ID Reflex", "Arrêt de départ", "Arrêt d'arrivée"].include? k
+ if ["ID Codif", "Oid", "OiD", "ID Reflex", "Arrêt de départ", "Arrêt d'arrivée", "Période de validité englobante"].include? k
hcont << content_tag(:th, k)
else
hcont << content_tag(:th, sortable_columns(collection, k))
diff --git a/app/views/time_tables/index.html.slim b/app/views/time_tables/index.html.slim
index 59e31ac76..fe52e2f99 100644
--- a/app/views/time_tables/index.html.slim
+++ b/app/views/time_tables/index.html.slim
@@ -40,9 +40,7 @@
.col-lg-12
= table_builder @time_tables,
{ :comment => 'comment', :color => '',
- :bounding_dates => Proc.new { |tt| tt.bounding_dates.empty? ? '-' : t('bounding_dates', debut: l(tt.bounding_dates.min), end: l(tt.bounding_dates.max)) },
- :calendar => Proc.new {|tt| tt.calendar ? tt.calendar.try(:name) : '-' },
- :updated_at => Proc.new {|tt| l(tt.updated_at, format: :short)} },
+ "Période de validité englobante" => Proc.new{ |tt| tt.bounding_dates.empty? ? '-' : t('bounding_dates', debut: l(tt.bounding_dates.min), end: l(tt.bounding_dates.max)) }, :calendar => Proc.new{ |tt| tt.calendar ? tt.calendar.try(:name) : '-' }, :updated_at => Proc.new {|tt| l(tt.updated_at, format: :short)} },
[:show, :edit, :delete],
[],
'table has-search'