From 1529e4b14ebd10efac60f6590b9820fc9dca3d65 Mon Sep 17 00:00:00 2001 From: Peng DU Date: Thu, 14 Jul 2016 12:18:24 +0200 Subject: [PATCH] allow active/disactive a training to show in training lists --- app/assets/javascripts/router.coffee.erb | 2 +- .../templates/admin/trainings/_form.html.erb | 18 ++++++++++++++++++ app/controllers/api/trainings_controller.rb | 5 ++++- app/views/api/trainings/show.json.jbuilder | 2 +- config/locales/app.shared.en.yml | 3 ++- config/locales/app.shared.fr.yml | 1 + ...160714095018_add_public_page_to_training.rb | 5 +++++ db/schema.rb | 3 ++- 8 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20160714095018_add_public_page_to_training.rb diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb index 728910568..16d42380e 100644 --- a/app/assets/javascripts/router.coffee.erb +++ b/app/assets/javascripts/router.coffee.erb @@ -371,7 +371,7 @@ angular.module('application.router', ['ui.router']). controller: 'TrainingsController' resolve: trainingsPromise: ['Training', (Training)-> - Training.query().$promise + Training.query({ public_page: true }).$promise ] translations: [ 'Translations', (Translations) -> Translations.query(['app.public.trainings_list']).$promise diff --git a/app/assets/templates/admin/trainings/_form.html.erb b/app/assets/templates/admin/trainings/_form.html.erb index b10ad2647..91e09131b 100644 --- a/app/assets/templates/admin/trainings/_form.html.erb +++ b/app/assets/templates/admin/trainings/_form.html.erb @@ -92,6 +92,24 @@ + +
+ +
+ + +
+
+
diff --git a/app/controllers/api/trainings_controller.rb b/app/controllers/api/trainings_controller.rb index f1b973b25..0269c8068 100644 --- a/app/controllers/api/trainings_controller.rb +++ b/app/controllers/api/trainings_controller.rb @@ -7,6 +7,9 @@ class API::TrainingsController < API::ApiController def index @requested_attributes = params[:requested_attributes] @trainings = policy_scope(Training) + if params[:public_page] + @trainings = @trainings.where(public_page: true) + end if attribute_requested?(@requested_attributes, 'availabilities') @trainings = @trainings.includes(:availabilities => [:slots => [:reservation => [:user => [:profile, :trainings]]]]).order('availabilities.start_at DESC') @@ -62,6 +65,6 @@ class API::TrainingsController < API::ApiController end def training_params - params.require(:training).permit(:id, :name, :description, :machine_ids, :plan_ids, :nb_total_places, training_image_attributes: [:attachment], machine_ids: [], plan_ids: []) + params.require(:training).permit(:id, :name, :description, :machine_ids, :plan_ids, :nb_total_places, :public_page, training_image_attributes: [:attachment], machine_ids: [], plan_ids: []) end end diff --git a/app/views/api/trainings/show.json.jbuilder b/app/views/api/trainings/show.json.jbuilder index 3621b8a78..ea54df304 100644 --- a/app/views/api/trainings/show.json.jbuilder +++ b/app/views/api/trainings/show.json.jbuilder @@ -1,4 +1,4 @@ -json.extract! @training, :id, :name, :description, :machine_ids, :nb_total_places +json.extract! @training, :id, :name, :description, :machine_ids, :nb_total_places, :public_page json.training_image @training.training_image.attachment.large.url if @training.training_image json.availabilities @training.availabilities.order('start_at DESC') do |a| json.id a.id diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index 288cf66ab..2ec91ab08 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -220,6 +220,7 @@ en: validate_your_training: "Validate your training" associated_machines: "Associated machines" number_of_tickets: "Number of tickets" + public_page: "Show in training lists" user_admin: # partial form to edit/create an user (admin view) @@ -291,4 +292,4 @@ en: no_projects: "No projects" author: "Author" collaborator: "Collaborator" - private_profile: "Private profile" \ No newline at end of file + private_profile: "Private profile" diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 9593111a6..4d01c6fa5 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -220,6 +220,7 @@ fr: validate_your_training: "Valider votre formation" associated_machines: "Machines associées" number_of_tickets: "Nombre de places" + public_page: "Afficher dans la liste de formation" user_admin: # formulaire partiel d'édition/création utilisateur (vue admin) diff --git a/db/migrate/20160714095018_add_public_page_to_training.rb b/db/migrate/20160714095018_add_public_page_to_training.rb new file mode 100644 index 000000000..5476f0b5e --- /dev/null +++ b/db/migrate/20160714095018_add_public_page_to_training.rb @@ -0,0 +1,5 @@ +class AddPublicPageToTraining < ActiveRecord::Migration + def change + add_column :trainings, :public_page, :boolean, default: true + end +end diff --git a/db/schema.rb b/db/schema.rb index fb8e277d7..950914a6d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160630140204) do +ActiveRecord::Schema.define(version: 20160714095018) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -592,6 +592,7 @@ ActiveRecord::Schema.define(version: 20160630140204) do t.integer "nb_total_places" t.string "slug", limit: 255 t.text "description" + t.boolean "public_page", default: true end add_index "trainings", ["slug"], name: "index_trainings_on_slug", unique: true, using: :btree