diff --git a/app/assets/javascripts/controllers/trainings.coffee.erb b/app/assets/javascripts/controllers/trainings.coffee.erb index c712583ad..d4377c9ab 100644 --- a/app/assets/javascripts/controllers/trainings.coffee.erb +++ b/app/assets/javascripts/controllers/trainings.coffee.erb @@ -12,13 +12,13 @@ Application.Controllers.controller "TrainingsController", ['$scope', '$state', ' # Callback for the 'reserve' button ## $scope.reserveTraining = (training, event) -> - $state.go('app.logged.trainings_reserve', {id: training.id}) + $state.go('app.logged.trainings_reserve', {id: training.slug}) ## # Callback for the 'show' button ## $scope.showTraining = (training) -> - $state.go('app.public.training_show', {id: training.id}) + $state.go('app.public.training_show', {id: training.slug}) ] diff --git a/app/controllers/api/trainings_controller.rb b/app/controllers/api/trainings_controller.rb index a00d0fc4a..45ae39af5 100644 --- a/app/controllers/api/trainings_controller.rb +++ b/app/controllers/api/trainings_controller.rb @@ -17,7 +17,7 @@ class API::TrainingsController < API::ApiController end def show - @training = Training.find(params[:id]) + @training = Training.friendly.find(params[:id]) end def create diff --git a/app/views/api/trainings/index.json.jbuilder b/app/views/api/trainings/index.json.jbuilder index 0ca39d0e3..51550ce1b 100644 --- a/app/views/api/trainings/index.json.jbuilder +++ b/app/views/api/trainings/index.json.jbuilder @@ -2,7 +2,7 @@ role = (current_user and current_user.is_admin?) ? 'admin' : 'user' json.cache! [@trainings, role] do json.array!(@trainings) do |training| - json.extract! training, :id, :name, :description, :machine_ids, :nb_total_places + json.extract! training, :id, :name, :description, :machine_ids, :nb_total_places, :slug json.training_image training.training_image.attachment.large.url if training.training_image json.plan_ids training.plan_ids if role === 'admin' end