Merge branch 'master' into staging

5 files changed, 14 insertions, 8 deletions

diff --git a/config/deploy.rb b/config/deploy.rb
index f8a7ebdef..cd6391ec3 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -13,7 +13,7 @@ set :bundle_cmd, "/var/lib/gems/2.2.0/bin/bundle"
 set :rake, "#{bundle_cmd} exec /var/lib/gems/2.2.0/bin/rake"
 
 set :keep_releases, 5
-after "deploy:update", "deploy:cleanup"
+after "deploy:restart", "deploy:cleanup"
 
 set :rails_env, -> { fetch(:stage) }
 set :deploy_via, :remote_cache
@@ -66,7 +66,7 @@ namespace :deploy do
   task :group_writable do
     run "sudo /usr/local/sbin/cap-fix-permissions #{deploy_to}"
   end
-  after "deploy:update", "deploy:group_writable"
+  after "deploy:restart", "deploy:group_writable"
 
   desc "Run db:seed"
   task :seed do
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 59bbea437..93ce2d8c6 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -29,7 +29,8 @@ Apartment.configure do |config|
     "LineReferential",
     "Chouette::Line",
     "Chouette::GroupOfLine",
-    "Chouette::Company"
+    "Chouette::Company",
+    "Chouette::Network"
   ]
 
   # use postgres schemas?
diff --git a/config/locales/networks.en.yml b/config/locales/networks.en.yml
index 0a5555b43..69b45050e 100644
--- a/config/locales/networks.en.yml
+++ b/config/locales/networks.en.yml
@@ -1,5 +1,5 @@
 en:
-  networks:
+  networks: &en_networks
     actions:
       new: "Add a new network"
       edit: "Edit this network"
@@ -17,7 +17,7 @@ en:
       advanced_search: "Advanced search"
   activerecord:
     models:
-      network: 
+      network:
         zero:  "network"
         one:   "network"
         other: "networks"
@@ -59,5 +59,7 @@ en:
       hub:
         network:
           name: "maximum 75 characters"
-          registration_number: "Positif integer, unique key, of no more than 8 digits." 
+          registration_number: "Positif integer, unique key, of no more than 8 digits."
           objectid: "[prefix]:PTNetwork:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 3."
+  referential_networks:
+    <<: *en_networks
\ No newline at end of file
diff --git a/config/locales/networks.fr.yml b/config/locales/networks.fr.yml
index 1abd6e1c0..c31982b43 100644
--- a/config/locales/networks.fr.yml
+++ b/config/locales/networks.fr.yml
@@ -1,5 +1,5 @@
 fr:
-  networks:
+  networks: &fr_networks
     actions:
       new: "Ajouter un réseau"
       edit: "Modifier ce réseau"
@@ -61,3 +61,5 @@ fr:
           name: "maximum 75 caractères"
           registration_number: "Entier positif, clé unique, d'un maximum de 8 chiffres."
           objectid: "[prefixe]:PTNetwork:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'. Longueur maximale de la clé unique = 3."
+  referential_networks:
+    <<: *fr_networks
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 1cd809c59..414bbde79 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -59,6 +59,7 @@ ChouetteIhm::Application.routes.draw do
     resources :lines
     resources :group_of_lines
     resources :companies
+    resources :networks
   end
 
   resources :referentials do
@@ -79,7 +80,7 @@ ChouetteIhm::Application.routes.draw do
       put :unarchive
     end
 
-    resources :networks
+    resources :networks, controller: "referential_networks"
 
     match 'lines' => 'lines#destroy_all', :via => :delete
     resources :lines, controller: "referential_lines" do