diff options
| -rw-r--r-- | app/controllers/networks_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/referential_networks_controller.rb | 8 | ||||
| -rw-r--r-- | app/views/networks/index.html.slim | 20 | ||||
| -rw-r--r-- | app/views/referential_networks/index.html.slim | 19 |
4 files changed, 44 insertions, 11 deletions
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb index 2e2f3f0d1..d1f83340e 100644 --- a/app/controllers/networks_controller.rb +++ b/app/controllers/networks_controller.rb @@ -36,6 +36,14 @@ class NetworksController < BreadcrumbController if collection.out_of_bounds? redirect_to params.merge(:page => 1) end + + @networks = ModelDecorator.decorate( + @networks, + with: NetworkDecorator, + context: { + line_referential: line_referential + } + ) } build_breadcrumb :index end diff --git a/app/controllers/referential_networks_controller.rb b/app/controllers/referential_networks_controller.rb index 8426c6ba3..e0ce71ce4 100644 --- a/app/controllers/referential_networks_controller.rb +++ b/app/controllers/referential_networks_controller.rb @@ -29,6 +29,14 @@ class ReferentialNetworksController < ChouetteController if collection.out_of_bounds? redirect_to params.merge(:page => 1) end + + @networks = ModelDecorator.decorate( + @networks, + with: ReferentialNetworkDecorator, + context: { + referential: referential + } + ) } build_breadcrumb :index end diff --git a/app/views/networks/index.html.slim b/app/views/networks/index.html.slim index 7381b62f4..4c1f9783c 100644 --- a/app/views/networks/index.html.slim +++ b/app/views/networks/index.html.slim @@ -22,12 +22,20 @@ - if @networks.any? .row .col-lg-12 - = table_builder @networks, - { 'Oid' => Proc.new { |n| n.try(:objectid).try(:local_id) }, - :name => 'name' }, - [:show, :edit, :delete], - [], - 'table has-search' + = table_builder_2 @networks, + [ \ + TableBuilderHelper::Column.new( \ + name: 'Oid', \ + attribute: Proc.new { |n| n.try(:objectid).try(:local_id) }, \ + sortable: false \ + ), + TableBuilderHelper::Column.new( \ + key: :name, \ + attribute: 'name' \ + ), \ + ], + links: [:show], + cls: 'table has-search' = new_pagination @networks, 'pull-right' diff --git a/app/views/referential_networks/index.html.slim b/app/views/referential_networks/index.html.slim index d6c52d352..c58a91321 100644 --- a/app/views/referential_networks/index.html.slim +++ b/app/views/referential_networks/index.html.slim @@ -22,11 +22,20 @@ - if @networks.any? .row .col-lg-12 - = table_builder @networks, - { 'ID Codifligne' => Proc.new { |n| n.try(:objectid).try(:local_id) }, :name => 'name' }, - [:show, :edit, :delete], - [], - 'table has-search' + = table_builder_2 @networks, + [ \ + TableBuilderHelper::Column.new( \ + name: 'ID Codifligne', \ + attribute: Proc.new { |n| n.try(:objectid).try(:local_id) }, \ + sortable: false \ + ), + TableBuilderHelper::Column.new( \ + key: :name, \ + attribute: 'name' \ + ) \ + ], + links: [:show], + cls: 'table has-search' = new_pagination @networks, 'pull-right' |