diff options
| author | jpl | 2016-11-21 18:49:41 +0100 |
|---|---|---|
| committer | jpl | 2016-11-21 18:49:41 +0100 |
| commit | 1a081d15a16f3bae8b2be35adf69ff4773265765 (patch) | |
| tree | c9d4ba7a43310ae4189c3a36b5f5b482ae9136a3 /app | |
| parent | ad2a4650eac510c95b0c04c4b069cb9cc10b7dce (diff) | |
| download | chouette-core-1a081d15a16f3bae8b2be35adf69ff4773265765.tar.bz2 | |
Refs #2019: fix tests on networks...
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/networks/_networks.html.slim | 8 | ||||
| -rw-r--r-- | app/views/referential_lines/_lines.html.slim | 3 | ||||
| -rw-r--r-- | app/views/referential_networks/_networks.html.slim | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/app/views/networks/_networks.html.slim b/app/views/networks/_networks.html.slim index 9f5197540..f5b8024a2 100644 --- a/app/views/networks/_networks.html.slim +++ b/app/views/networks/_networks.html.slim @@ -2,7 +2,7 @@ table.table.table-bordered.table-hover thead tr - th = @networks.human_attribute_name(:name) + th = Chouette::Network.human_attribute_name(:name) th.text-center = "Actions" tbody @@ -21,11 +21,11 @@ span.caret ul.dropdown-menu - li = link_to 'Voir', referential_network_path(@referential, network) + li = link_to 'Voir', line_referential_network_path(@line_referential, network) - if policy(network).update? - li = link_to 'Editer', edit_referential_network_path(@referential, network) + li = link_to 'Editer', edit_line_referential_network_path(@line_referential, network) - if policy(network).destroy? - li = link_to 'Supprimer', referential_network_path(@referential, network), method: :delete, data: { confirm: t('networks.actions.destroy_confirm') } + li = link_to 'Supprimer', line_referential_network_path(@line_referential, network), method: :delete, data: { confirm: t('networks.actions.destroy_confirm') } .text-center = will_paginate @networks, container: false, renderer: RemoteBootstrapPaginationLinkRenderer diff --git a/app/views/referential_lines/_lines.html.slim b/app/views/referential_lines/_lines.html.slim index 372aa46a8..8edbbbb82 100644 --- a/app/views/referential_lines/_lines.html.slim +++ b/app/views/referential_lines/_lines.html.slim @@ -3,6 +3,8 @@ = page_entries_info @lines .lines.paginated_content + = paginated_content(@lines) + table.table.table-bordered.table-hover thead tr @@ -10,7 +12,6 @@ th = @lines.human_attribute_name(:network) th = @lines.human_attribute_name(:company) - / = paginated_content(@lines) .text-center = will_paginate @lines, container: false, renderer: RemoteBootstrapPaginationLinkRenderer diff --git a/app/views/referential_networks/_networks.html.slim b/app/views/referential_networks/_networks.html.slim index 9f5197540..8177be318 100644 --- a/app/views/referential_networks/_networks.html.slim +++ b/app/views/referential_networks/_networks.html.slim @@ -2,7 +2,7 @@ table.table.table-bordered.table-hover thead tr - th = @networks.human_attribute_name(:name) + th = Chouette::Network.human_attribute_name(:name) th.text-center = "Actions" tbody |