diff options
| author | Robert | 2017-05-15 17:38:38 +0200 |
|---|---|---|
| committer | Robert | 2017-05-18 18:42:22 +0200 |
| commit | bfec2b6e73747193052639ee2bbf4340409510dc (patch) | |
| tree | 0d37ba9564781b5db7ba2edf7f8de53a06c91b33 /app | |
| parent | 8872c4707b806ff4ae412de99a561495c20fbc51 (diff) | |
| download | chouette-core-bfec2b6e73747193052639ee2bbf4340409510dc.tar.bz2 | |
Refs: #3144; calendar, line_footnotes and routes speced (spec/features)
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/access_link_pairs/_access_link_pair.html.slim | 1 | ||||
| -rw-r--r-- | app/views/group_of_lines/_group_of_line.html.slim | 10 | ||||
| -rw-r--r-- | app/views/referential_lines/show.html.slim | 1 | ||||
| -rw-r--r-- | app/views/routes/show.html.slim | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/app/views/access_link_pairs/_access_link_pair.html.slim b/app/views/access_link_pairs/_access_link_pair.html.slim index c313f9044..3eebfd7f6 100644 --- a/app/views/access_link_pairs/_access_link_pair.html.slim +++ b/app/views/access_link_pairs/_access_link_pair.html.slim @@ -1,4 +1,5 @@ tr + - require 'pry'; binding.pry td .link .access_point diff --git a/app/views/group_of_lines/_group_of_line.html.slim b/app/views/group_of_lines/_group_of_line.html.slim index fb9f95894..e33201f74 100644 --- a/app/views/group_of_lines/_group_of_line.html.slim +++ b/app/views/group_of_lines/_group_of_line.html.slim @@ -2,11 +2,11 @@ .panel-heading .panel-title.clearfix span.pull-right - - if edit && policy(group_of_line).update? - = link_to edit_line_referential_group_of_line_path(@line_referential, group_of_line), class: 'btn btn-default btn-sm' do - span.fa.fa-pencil - - if delete && policy(group_of_line).destroy? - = link_to('<span class="fa fa-trash-o"></span>'.html_safe, line_referential_group_of_line_path(@line_referential, group_of_line), :method => :delete, :data => {:confirm => t('group_of_lines.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm') + / - if edit && policy(group_of_line).update? + = link_to edit_line_referential_group_of_line_path(@line_referential, group_of_line), class: 'btn btn-default btn-sm' do + span.fa.fa-pencil + / - if delete && policy(group_of_line).destroy? + = link_to('<span class="fa fa-trash-o"></span>'.html_safe, line_referential_group_of_line_path(@line_referential, group_of_line), :method => :delete, :data => {:confirm => t('group_of_lines.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm') h5 = link_to [@line_referential, group_of_line], :class => "preview", :title => "#{Chouette::GroupOfLine.model_name.human.capitalize} #{group_of_line.name}" do diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim index 1e24f0f15..4c8b09ab2 100644 --- a/app/views/referential_lines/show.html.slim +++ b/app/views/referential_lines/show.html.slim @@ -22,6 +22,7 @@ span.fa.fa-trash span = t('lines.actions.destroy') + - require 'pry'; binding.pry - if !@line.hub_restricted? || (@line.hub_restricted? && @line.routes.size < 2) - if policy(Chouette::Route).create? && @referential.organisation == current_organisation = link_to t('routes.actions.new'), new_referential_line_route_path(@referential, @line), class: 'btn btn-primary' diff --git a/app/views/routes/show.html.slim b/app/views/routes/show.html.slim index 5aebae055..d994e3861 100644 --- a/app/views/routes/show.html.slim +++ b/app/views/routes/show.html.slim @@ -20,7 +20,7 @@ span.fa.fa-trash span = t('actions.destroy') -/ PägeContent +/ PageContent .page_content .container-fluid .row |