Fix companies tests

4 files changed, 21 insertions, 16 deletions

diff --git a/app/views/companies/_companies.html.slim b/app/views/companies/_companies.html.slim
index 4f89e8ede..8e83d29a0 100644
--- a/app/views/companies/_companies.html.slim
+++ b/app/views/companies/_companies.html.slim
@@ -2,11 +2,18 @@
 /   span.search = t('will_paginate.page_entries_info.search')
 /   = page_entries_info @companies
 
-.companies.paginated_content style="margin-top:20px;"
-  = table_builder @decoratedcompanies,
-                  [:name, :edited_at, :published_at, :validity_period, :linecount, :transporter, :status],
-                  ["show", "delete"],
-                  'table table-bordered'
+.companies.paginated_content
+  = paginated_content(@companies)
 
 .pagination
-  = will_paginate @companies, container: false, renderer: RemoteBootstrapPaginationLinkRenderer
+  = will_paginate @companies, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer
+
+
+/ .companies.paginated_content style="margin-top:20px;"
+/   = table_builder @decoratedcompanies,
+/     { Chouette::Company.human_attribute_name(:name) => 'name', Chouette::Company.human_attribute_name(:edited_at) => 'edited_at', Chouette::Company.human_attribute_name(:published_at) => 'published_at', Chouette::Company.human_attribute_name(:validity_period) => 'validity_period', Chouette::Company.human_attribute_name(:linecount) => 'linecount', Chouette::Company.human_attribute_name(:transporter) => 'transporter', Chouette::Company.human_attribute_name(:status) => 'status' },
+/     [:show, :delete],
+/     'table table-bordered'
+/ 
+/ .pagination
+/   = will_paginate @companies, container: false, renderer: RemoteBootstrapPaginationLinkRenderer
diff --git a/app/views/referential_companies/_companies.html.slim b/app/views/referential_companies/_companies.html.slim
index bcd471cc7..0a8c681f2 100644
--- a/app/views/referential_companies/_companies.html.slim
+++ b/app/views/referential_companies/_companies.html.slim
@@ -6,4 +6,4 @@
   = paginated_content(@companies)
 
 .pagination
-  = will_paginate @companies, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer
\ No newline at end of file
+  = will_paginate @companies, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer
diff --git a/app/views/referential_networks/_networks.html.slim b/app/views/referential_networks/_networks.html.slim
deleted file mode 100644
index b14af3bf0..000000000
--- a/app/views/referential_networks/_networks.html.slim
+++ /dev/null
@@ -1,8 +0,0 @@
-.networks
-  = table_builder @networks,
-    { 'Oid' => Proc.new { |n| n.objectid.local_id }, Chouette::Network.human_attribute_name(:name) => 'name' },
-    [:show, :edit, :delete],
-    'table table-bordered'
-
-  .text-center
-    = will_paginate @networks, container: false, renderer: RemoteBootstrapPaginationLinkRenderer
diff --git a/app/views/referential_networks/index.html.slim b/app/views/referential_networks/index.html.slim
index e3e9f2a07..a550ac7af 100644
--- a/app/views/referential_networks/index.html.slim
+++ b/app/views/referential_networks/index.html.slim
@@ -14,7 +14,13 @@
       / <!-- </a> -->
 
 #networks
-  = render 'networks'
+  = table_builder @networks,
+    { 'Oid' => Proc.new { |n| n.objectid.local_id }, Chouette::Network.human_attribute_name(:name) => 'name' },
+    [:show, :edit, :delete],
+    'table table-bordered'
+
+  .text-center
+    = will_paginate @networks, container: false, renderer: RemoteBootstrapPaginationLinkRenderer
 
 - content_for :sidebar do
   ul.actions