Merge branch 'change_start_and_end_date_to_datetime' into production

Evandro Jr
2 parents 364e52a3 a602848f
Showing 6 changed files with 60 additions and 1 deletions Show diff stats
app/models/event.rb
app/views/cms/_event.html.erb
db/migrate/20150615215500_alter_column_articles_start_date.rb
db/migrate/20150615215658_alter_column_articles_end_date.rb
db/migrate/20150615222147_alter_column_article_versions_end_date.rb
db/migrate/20150615222204_alter_column_article_versions_start_date.rb
@@ -3,13 +3,14 @@ require &#39;builder&#39;
 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)
@@ -10,8 +10,14 @@
 <%= labelled_form_field(_('Start date'), pick_date(:article, :start_date)) %>
+<%= labelled_form_field(_('Start time'), time_select(:article, :start_date)) %>
+
 <%= labelled_form_field(_('End date'), pick_date(:article, :end_date)) %>
+<%= labelled_form_field(_('End time'), time_select(:article, :end_date)) %>
+
+<%= labelled_form_field(_('Presenter:'), text_field(:article, :presenter)) %>
+
 <%= labelled_form_field(_('Event website:'), text_field(:article, :link)) %>
 <%= labelled_form_field(_('Address:'), text_field(:article, :address)) %>
@@ -0,0 +1,13 @@
+class AlterColumnArticlesStartDate < ActiveRecord::Migration
+  def up
+    change_table :articles do |t|
+      t.change :start_date, :datetime
+    end
+  end
+
+  def down
+    change_table :articles do |t|
+      t.change :start_date, :date
+    end
+  end
+end
@@ -0,0 +1,13 @@
+class AlterColumnArticlesEndDate < ActiveRecord::Migration
+  def up
+    change_table :articles do |t|
+      t.change :end_date, :datetime
+    end
+  end
+
+  def down
+    change_table :articles do |t|
+      t.change :end_date, :date
+    end
+  end
+end
@@ -0,0 +1,13 @@
+class AlterColumnArticleVersionsEndDate < ActiveRecord::Migration
+  def up
+    change_table :article_versions do |t|
+      t.change :end_date, :datetime
+    end
+  end
+
+  def down
+    change_table :article_versions do |t|
+      t.change :end_date, :date
+    end
+  end
+end
@@ -0,0 +1,13 @@
+class AlterColumnArticleVersionsStartDate < ActiveRecord::Migration
+  def up
+    change_table :article_versions do |t|
+      t.change :start_date, :datetime
+    end
+  end
+
+  def down
+    change_table :article_versions do |t|
+      t.change :start_date, :date
+    end
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class AlterColumnArticlesStartDate < ActiveRecord::Migration
	2	+ def up
	3	+ change_table :articles do \|t\|
	4	+ t.change :start_date, :datetime
	5	+ end
	6	+ end
	7	+
	8	+ def down
	9	+ change_table :articles do \|t\|
	10	+ t.change :start_date, :date
	11	+ end
	12	+ end
	13	+end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class AlterColumnArticlesEndDate < ActiveRecord::Migration
	2	+ def up
	3	+ change_table :articles do \|t\|
	4	+ t.change :end_date, :datetime
	5	+ end
	6	+ end
	7	+
	8	+ def down
	9	+ change_table :articles do \|t\|
	10	+ t.change :end_date, :date
	11	+ end
	12	+ end
	13	+end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class AlterColumnArticleVersionsEndDate < ActiveRecord::Migration
	2	+ def up
	3	+ change_table :article_versions do \|t\|
	4	+ t.change :end_date, :datetime
	5	+ end
	6	+ end
	7	+
	8	+ def down
	9	+ change_table :article_versions do \|t\|
	10	+ t.change :end_date, :date
	11	+ end
	12	+ end
	13	+end
	@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
		1	+class AlterColumnArticleVersionsStartDate < ActiveRecord::Migration
		2	+ def up
		3	+ change_table :article_versions do \|t\|
		4	+ t.change :start_date, :datetime
		5	+ end
		6	+ end
		7	+
		8	+ def down
		9	+ change_table :article_versions do \|t\|
		10	+ t.change :start_date, :date
		11	+ end
		12	+ end
		13	+end
0	\ No newline at end of file	14	\ No newline at end of file