aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorteddywing2018-04-20 17:12:24 +0200
committerGitHub2018-04-20 17:12:24 +0200
commit11ba2437b090373ebf1662f30fad227576f2448d (patch)
treea75fb6027b8a6635a0725c42b64751f466f1c8ff
parentb51eab242753ecac8154714f2467395b6d9ee86c (diff)
parent4541312a4ccbfb0986affcd6b6f02e7a6412ee11 (diff)
downloadchouette-core-11ba2437b090373ebf1662f30fad227576f2448d.tar.bz2
Merge pull request #473 from af83/6457-vj-company-affectation
Refs #6457 Fix VJ Company affectation
-rw-r--r--app/controllers/referential_companies_controller.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/app/controllers/referential_companies_controller.rb b/app/controllers/referential_companies_controller.rb
index 200e56a89..4f73c4268 100644
--- a/app/controllers/referential_companies_controller.rb
+++ b/app/controllers/referential_companies_controller.rb
@@ -18,6 +18,10 @@ class ReferentialCompaniesController < ChouetteController
@companies = decorate_companies(@companies)
}
+ format.json {
+ render json: companies_maps
+ }
+
format.js {
@companies = decorate_companies(@companies)
}
@@ -85,4 +89,13 @@ class ReferentialCompaniesController < ChouetteController
)
end
+ def companies_maps
+ @companies.collect do |company|
+ { :id => company.id.to_s,
+ :objectid => company.raw_objectid,
+ :name => company.name,
+ }
+ end
+ end
+
end