From 43dcc338adc7639ef9081d8fc7bcce80e5bde35d Mon Sep 17 00:00:00 2001 From: Adrian Hinz Date: Fri, 13 Sep 2019 14:41:10 +0200 Subject: [PATCH] fixed lessons --- app/controllers/admin/lessons_controller.rb | 2 ++ app/controllers/admin/weeks_controller.rb | 4 +++- app/models/week.rb | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/lessons_controller.rb b/app/controllers/admin/lessons_controller.rb index 3e4580f..8fa076b 100644 --- a/app/controllers/admin/lessons_controller.rb +++ b/app/controllers/admin/lessons_controller.rb @@ -29,6 +29,7 @@ module Admin @lesson = Lesson.new(admin_lesson_params) @week = @lesson.week @lesson.course = @week.course + @course = @week.course params[:week_id] = @week.id respond_to do |format| if @lesson.save @@ -89,6 +90,7 @@ module Admin def set_object @lesson = Lesson.find(params[:id]) @week = @lesson.week + @course = @week.course params[:week_id] = @week.id end diff --git a/app/controllers/admin/weeks_controller.rb b/app/controllers/admin/weeks_controller.rb index c2551b7..795d32a 100644 --- a/app/controllers/admin/weeks_controller.rb +++ b/app/controllers/admin/weeks_controller.rb @@ -13,7 +13,9 @@ module Admin # GET /admin/weeks/1 # GET /admin/weeks/1.json - def show; end + def show + @lessons = @week.lessons.page(params[:page]) + end # GET /admin/weeks/new def new diff --git a/app/models/week.rb b/app/models/week.rb index 83b98e1..ffc1be1 100644 --- a/app/models/week.rb +++ b/app/models/week.rb @@ -10,6 +10,7 @@ class Week < ApplicationRecord # == Relationships ======================================================== belongs_to :course + has_many :lessons # == Validations ========================================================== validates :name, presence: true