aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorZog2018-01-21 11:59:33 +0100
committerZog2018-01-25 17:18:00 +0100
commite96174ac9c12c89b701307c50e7e1a2b09190316 (patch)
tree218cf5b23d7023fb3dafa28e1e9887baf727e0dc /app
parentb73fa6fca72590e943ca36265c39f0672765b9aa (diff)
downloadchouette-core-e96174ac9c12c89b701307c50e7e1a2b09190316.tar.bz2
Refs 5586; CR #1
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/components/_buttons.sass2
-rw-r--r--app/controllers/lines_controller.rb2
-rw-r--r--app/decorators/line_decorator.rb4
-rw-r--r--app/decorators/time_table_decorator.rb7
4 files changed, 4 insertions, 11 deletions
diff --git a/app/assets/stylesheets/components/_buttons.sass b/app/assets/stylesheets/components/_buttons.sass
index 9a99ba8bc..a7010ae09 100644
--- a/app/assets/stylesheets/components/_buttons.sass
+++ b/app/assets/stylesheets/components/_buttons.sass
@@ -150,7 +150,7 @@ table, .table
white-space: nowrap
padding: 5px 15px
font-weight: normal
- line-height: 1.42857
+ line-height: $line-height
display: block
font-size: 14px
&:hover
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index 22578187f..27a9bf9be 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -70,8 +70,6 @@ class LinesController < ChouetteController
end
end
- helper_method :decorated_collection
-
protected
def filtered_lines_maps
diff --git a/app/decorators/line_decorator.rb b/app/decorators/line_decorator.rb
index d8ffdad69..7d247a99c 100644
--- a/app/decorators/line_decorator.rb
+++ b/app/decorators/line_decorator.rb
@@ -17,12 +17,12 @@ class LineDecorator < AF83::Decorator
l.href { [context[:line_referential], object] }
end
- instance_decorator.action_link do |l|
+ instance_decorator.action_link secondary: :show do |l|
l.content t('lines.actions.show_network')
l.href { [context[:line_referential], object.network] }
end
- instance_decorator.action_link do |l|
+ instance_decorator.action_link secondary: :show do |l|
l.content t('lines.actions.show_company')
l.href { [context[:line_referential], object.company] }
l.disabled { object.company.nil? }
diff --git a/app/decorators/time_table_decorator.rb b/app/decorators/time_table_decorator.rb
index d3aef4550..9a56fc2ee 100644
--- a/app/decorators/time_table_decorator.rb
+++ b/app/decorators/time_table_decorator.rb
@@ -46,12 +46,7 @@ class TimeTableDecorator < AF83::Decorator
end
instance_decorator.destroy_action_link do |l|
- l.href do
- h.duplicate_referential_time_table_path(
- context[:referential],
- object
- )
- end
+ l.href { h.referential_time_table_path(context[:referential], object) }
l.data {{ confirm: h.t('time_tables.actions.destroy_confirm') }}
end
end