merge conflicts resolved

1 files changed, 16 insertions, 7 deletions

diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
index d1f83340e..5dae1ba3f 100644
--- a/app/controllers/networks_controller.rb
+++ b/app/controllers/networks_controller.rb
@@ -37,14 +37,13 @@ class NetworksController < BreadcrumbController
           redirect_to params.merge(:page => 1)
         end
 
-        @networks = ModelDecorator.decorate(
-          @networks,
-          with: NetworkDecorator,
-          context: {
-            line_referential: line_referential
-          }
-        )
+        @networks = decorate_networks(@networks)
       }
+
+      format.js {
+        @networks = decorate_networks(@networks)
+      }
+
       build_breadcrumb :index
     end
   end
@@ -87,4 +86,14 @@ class NetworksController < BreadcrumbController
     %w[asc desc].include?(params[:direction]) ?  params[:direction] : 'asc'
   end
 
+  def decorate_networks(networks)
+    ModelDecorator.decorate(
+      networks,
+      with: NetworkDecorator,
+      context: {
+        line_referential: line_referential
+      }
+    )
+  end
+
 end