From a522623b367acc6249e28412987635514c17b234 Mon Sep 17 00:00:00 2001 From: Evandro Jr Date: Mon, 15 Jun 2015 19:29:25 -0300 Subject: [PATCH] Adds support to time (HH:MM) in Events --- app/models/event.rb | 3 ++- app/views/cms/_event.html.erb | 6 ++++-- db/migrate/20150617222204_event_period_with_support_to_datetime.rb | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20150617222204_event_period_with_support_to_datetime.rb diff --git a/app/models/event.rb b/app/models/event.rb index 12e2993..2364c5a 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -3,13 +3,14 @@ require 'builder' class Event < Article - attr_accessible :start_date, :end_date, :link, :address + attr_accessible :start_date, :end_date, :link, :address, :start_hour, :start_minute, :presenter def self.type_name _('Event') end settings_items :address, :type => :string + settings_items :presenter, :type => :string def link=(value) self.setting[:link] = maybe_add_http(value) diff --git a/app/views/cms/_event.html.erb b/app/views/cms/_event.html.erb index e32d52a..b3692db 100644 --- a/app/views/cms/_event.html.erb +++ b/app/views/cms/_event.html.erb @@ -8,9 +8,11 @@ <%= render :partial => 'general_fields' %> <%= render :partial => 'translatable' %> -<%= labelled_form_field(_('Start date'), pick_date(:article, :start_date)) %> +<%= labelled_form_field(_('Start date and time'), datetime_select(:article, :start_date)) %> -<%= labelled_form_field(_('End date'), pick_date(:article, :end_date)) %> +<%= labelled_form_field(_('End date and time'), datetime_select(:article, :end_date)) %> + +<%= labelled_form_field(_('Presenter:'), text_field(:article, :presenter)) %> <%= labelled_form_field(_('Event website:'), text_field(:article, :link)) %> diff --git a/db/migrate/20150617222204_event_period_with_support_to_datetime.rb b/db/migrate/20150617222204_event_period_with_support_to_datetime.rb new file mode 100644 index 0000000..a9d64b3 --- /dev/null +++ b/db/migrate/20150617222204_event_period_with_support_to_datetime.rb @@ -0,0 +1,37 @@ +class EventPeriodWithSupportToDatetime < ActiveRecord::Migration + def up + change_table :articles do |t| + t.change :start_date, :datetime + end + + change_table :articles do |t| + t.change :end_date, :datetime + end + + change_table :article_versions do |t| + t.change :start_date, :datetime + end + + change_table :article_versions do |t| + t.change :end_date, :datetime + end + end + + def down + change_table :articles do |t| + t.change :start_date, :date + end + + change_table :articles do |t| + t.change :end_date, :date + end + + change_table :article_versions do |t| + t.change :start_date, :date + end + + change_table :article_versions do |t| + t.change :end_date, :date + end + end +end \ No newline at end of file -- libgit2 0.21.2