Merge pull request #132 from af83/5127_new_api_endpoints

Refs #5127 Add two new endpoints to the API

5 files changed, 16 insertions, 3 deletions

diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb
index 14c3d5470..970f933f0 100644
--- a/config/breadcrumbs.rb
+++ b/config/breadcrumbs.rb
@@ -81,6 +81,11 @@ crumb :import do |workbench, import|
   parent :imports, workbench
 end
 
+crumb :import_resources do |import, import_resources|
+  link I18n.t('import_resources.index.title'), workbench_import_import_resources_path(import.workbench, import)
+  parent :import, import.workbench, import
+end
+
 crumb :organisation do |organisation|
   link breadcrumb_name(organisation), organisation_path(organisation)
 end
diff --git a/config/locales/compliance_check_sets.en.yml b/config/locales/compliance_check_sets.en.yml
index 87d9abef0..8023da0f7 100644
--- a/config/locales/compliance_check_sets.en.yml
+++ b/config/locales/compliance_check_sets.en.yml
@@ -22,6 +22,8 @@ en:
       table_state: "%{lines_status} lines imported on %{lines_in_compliance_check_set} in the archive"
       table_explanation: "These controls apply to all imported data and condition the construction of your organization's offer."
       metrics: "%{ok_count} ok, %{error_count} errors, %{warning_count} warnings, %{uncheck_count} n/a"
+    errors:
+      no_parent: "The compliance check set doesn't any parent"
   activerecord:
     attributes:
       compliance_check_set:
diff --git a/config/locales/compliance_check_sets.fr.yml b/config/locales/compliance_check_sets.fr.yml
index 84db8b934..0382f2937 100644
--- a/config/locales/compliance_check_sets.fr.yml
+++ b/config/locales/compliance_check_sets.fr.yml
@@ -18,6 +18,8 @@ fr:
       table_state: "%{lines_status} lignes importées sur %{lines_in_compliance_check_set} présentes dans l'archive"
       table_explanation: Ces contrôles s’appliquent pour toutes les données importées et conditionnent la construction de l’offre de votre organisation
       metrics: "%{ok_count} ok, %{error_count} errors, %{warning_count} warnings, %{uncheck_count} n/a"
+    errors:
+      no_parent: "Le jeux de contrôle n'a pas de parent"
   activerecord:
     attributes:
       compliance_check_set:
diff --git a/config/routes.rb b/config/routes.rb
index 8ea8168bf..65fa62557 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -64,9 +64,10 @@ ChouetteIhm::Application.routes.draw do
       resources :stop_areas, only: [:index, :show]
       resources :time_tables, only: [:index, :show]
       resources :vehicle_journeys, only: :show
-      patch 'compliance_check_sets/:id',
-        to: 'compliance_check_sets#validated',
-        as: 'compliance_check_set'
+      namespace :internals do
+        get 'compliance_check_sets/:id/notify_parent', to: 'compliance_check_sets#notify_parent'
+        get 'netex_imports/:id/notify_parent', to: 'netex_imports#notify_parent'
+      end
     end
   end
 
diff --git a/config/secrets.yml b/config/secrets.yml
index 2f9d5abe6..0de3fd6ef 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -13,6 +13,7 @@
 development:
   secret_key_base: e901adb90fc1fff22f7237d138ef232a5425b67e81ccb3ce7003aab2c002d35a7c3d593c0fca3dcb21e8c911a8260c984a830d1d61776ad3005eb373abebc695
   api_endpoint: "http://localhost:8080/chouette_iev/"
+  api_token: VFHir2GWWjuRNZnHHnQD5Hn+ubRMQ1kNLnu7oCLf+4KR8+PmYqb1EzKZmmuRfVP/yxS0aQ3NklfNbbgUatTtly5540oo4L6ePdbYkwDzrBXF9xgYekOlTCwIGSl430mluv3wcXNEbrRLu2CevIBULtiRZriAEYVOpp9G+lQI+t8=
   google_analytic_tracker: "UA-AAAAAAAA"
   # geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa"
   newrelic_licence_key: ""
@@ -21,6 +22,7 @@ development:
 test:
   secret_key_base: 54f61aab23322611dd0bbf73b7f034db34281f7f4b3c4992eaaff20ecc9673bbd467beaa6fcb48379ca69b80bc5662deac4e33ca144f2482146123d3e966016a
   api_endpoint: "http://localhost:8080/chouette_iev/"
+  api_token: VFHir2GWWjuRNZnHHnQD5Hn+ubRMQ1kNLnu7oCLf+4KR8+PmYqb1EzKZmmuRfVP/yxS0aQ3NklfNbbgUatTtly5540oo4L6ePdbYkwDzrBXF9xgYekOlTCwIGSl430mluv3wcXNEbrRLu2CevIBULtiRZriAEYVOpp9G+lQI+t8=
   google_analytic_tracker: "UA-AAAAAAAA"
   # geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa"
   osrm_endpoint: "http://router.project-osrm.org"
@@ -30,6 +32,7 @@ test:
 production:
   secret_key_base: 54f61aab23322611dd0bbf73b7f034db34281f7f4b3c4992eaaff20ecc9673bbd467beaa6fcb48379ca69b80bc5662deac4e33ca144f2482146123d3e966016a
   api_endpoint: "http://localhost:8080/chouette_iev/"
+  api_token: VFHir2GWWjuRNZnHHnQD5Hn+ubRMQ1kNLnu7oCLf+4KR8+PmYqb1EzKZmmuRfVP/yxS0aQ3NklfNbbgUatTtly5540oo4L6ePdbYkwDzrBXF9xgYekOlTCwIGSl430mluv3wcXNEbrRLu2CevIBULtiRZriAEYVOpp9G+lQI+t8=
   google_analytic_tracker: "UA-AAAAAAAA"
   # geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa"
   newrelic_licence_key: ""