Download as
Browse Code »

Commit 8f14851f25eb81b91b5379f95b2712de7c91a632

Authored by Evandro Jr
2 parents dca569a4 a522623b
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'change_start_and_end_date_to_datetime' into production 

Conflicts:
	app/views/cms/_event.html.erb
Showing 2 changed files with 40 additions and 3 deletions   Show diff stats
app/views/cms/_event.html.erb
  Diff comments   View file @8f14851
@@ -8,11 +8,11 @@ @@ -8,11 +8,11 @@
8 <%= render :partial => 'general_fields' %> 8 <%= render :partial => 'general_fields' %>
9 <%= render :partial => 'translatable' %> 9 <%= render :partial => 'translatable' %>
10 10
11 -<%= labelled_form_field(_('Start date'), pick_date(:article, :start_date)) %> 11 +<%= labelled_form_field(_('Start date and time'), datetime_select(:article, :start_date)) %>
12 12
13 -<%= labelled_form_field(_('Start time'), time_select(:article, :start_date)) %> 13 +<%= labelled_form_field(_('End date and time'), datetime_select(:article, :end_date)) %>
14 14
15 -<%= labelled_form_field(_('End date'), pick_date(:article, :end_date)) %> 15 +<%= labelled_form_field(_('Presenter:'), text_field(:article, :presenter)) %>
16 16
17 <%= labelled_form_field(_('End time'), time_select(:article, :end_date)) %> 17 <%= labelled_form_field(_('End time'), time_select(:article, :end_date)) %>
18 18
db/migrate/20150617222204_event_period_with_support_to_datetime.rb 0 → 100644
  Diff comments   View file @8f14851
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
  1 +class EventPeriodWithSupportToDatetime < ActiveRecord::Migration
  2 + def up
  3 + change_table :articles do |t|
  4 + t.change :start_date, :datetime
  5 + end
  6 +
  7 + change_table :articles do |t|
  8 + t.change :end_date, :datetime
  9 + end
  10 +
  11 + change_table :article_versions do |t|
  12 + t.change :start_date, :datetime
  13 + end
  14 +
  15 + change_table :article_versions do |t|
  16 + t.change :end_date, :datetime
  17 + end
  18 + end
  19 +
  20 + def down
  21 + change_table :articles do |t|
  22 + t.change :start_date, :date
  23 + end
  24 +
  25 + change_table :articles do |t|
  26 + t.change :end_date, :date
  27 + end
  28 +
  29 + change_table :article_versions do |t|
  30 + t.change :start_date, :date
  31 + end
  32 +
  33 + change_table :article_versions do |t|
  34 + t.change :end_date, :date
  35 + end
  36 + end
  37 +end
0 \ No newline at end of file 38 \ No newline at end of file