diff --git a/app/controllers/admin/conferences_controller.rb b/app/controllers/admin/conferences_controller.rb index b7063e6e..e4309b7a 100644 --- a/app/controllers/admin/conferences_controller.rb +++ b/app/controllers/admin/conferences_controller.rb @@ -177,7 +177,8 @@ module Admin def conference_params params.require(:conference).permit(:title, :short_title, :description, :timezone, - :start_date, :end_date, :rooms_attributes, :tracks_attributes, + :start_date, :end_date, :start_hour, :end_hour, + :rooms_attributes, :tracks_attributes, :tickets_attributes, :event_types_attributes, :picture, :picture_cache, :questions_attributes, :question_ids, :answers_attributes, :answer_ids, :difficulty_levels_attributes, diff --git a/app/views/admin/conferences/edit.html.haml b/app/views/admin/conferences/edit.html.haml index dfc6d72a..8ba8f80e 100644 --- a/app/views/admin/conferences/edit.html.haml +++ b/app/views/admin/conferences/edit.html.haml @@ -21,6 +21,8 @@ = f.input :timezone, :as => :time_zone, :hint => "The conference time zone" = f.input :start_date, :as => :string, :input_html => { :id => "conference-start-datepicker", :readonly => "readonly" } = f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly" } + = f.input :start_hour, :input_html => {size: 2, type: 'number', min: 0, max: 23} + = f.input :end_hour, :input_html => {size: 2, type: 'number', min: 1, max: 24} = f.inputs name: "Registrations" do = f.input :registration_limit, as: :number, in: 0..9999, hint: "Limit the number of registrations to the conference (0 no limit)" = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}