From 77d9cc0a70556e4798ae55a8840901f71256c8bd Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Wed, 17 Jun 2015 11:00:26 -0300
Subject: [PATCH] Revert "Merge branch 'change_start_and_end_date_to_datetime' into production"

---
 app/models/event.rb                                                   |  3 +--
 app/views/cms/_event.html.erb                                         |  6 ------
 db/migrate/20150615215500_alter_column_articles_start_date.rb         | 13 -------------
 db/migrate/20150615215658_alter_column_articles_end_date.rb           | 13 -------------
 db/migrate/20150615222147_alter_column_article_versions_end_date.rb   | 13 -------------
 db/migrate/20150615222204_alter_column_article_versions_start_date.rb | 13 -------------
 6 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 db/migrate/20150615215500_alter_column_articles_start_date.rb
 delete mode 100644 db/migrate/20150615215658_alter_column_articles_end_date.rb
 delete mode 100644 db/migrate/20150615222147_alter_column_article_versions_end_date.rb
 delete mode 100644 db/migrate/20150615222204_alter_column_article_versions_start_date.rb

diff --git a/app/models/event.rb b/app/models/event.rb
index 2364c5a..12e2993 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -3,14 +3,13 @@ require 'builder'
 
 class Event < Article
 
-  attr_accessible :start_date, :end_date, :link, :address, :start_hour, :start_minute, :presenter
+  attr_accessible :start_date, :end_date, :link, :address
 
   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 ce7c160..e32d52a 100644
--- a/app/views/cms/_event.html.erb
+++ b/app/views/cms/_event.html.erb
@@ -10,14 +10,8 @@
 
 <%= 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)) %>
diff --git a/db/migrate/20150615215500_alter_column_articles_start_date.rb b/db/migrate/20150615215500_alter_column_articles_start_date.rb
deleted file mode 100644
index eef2e79..0000000
--- a/db/migrate/20150615215500_alter_column_articles_start_date.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/db/migrate/20150615215658_alter_column_articles_end_date.rb b/db/migrate/20150615215658_alter_column_articles_end_date.rb
deleted file mode 100644
index e410904..0000000
--- a/db/migrate/20150615215658_alter_column_articles_end_date.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/db/migrate/20150615222147_alter_column_article_versions_end_date.rb b/db/migrate/20150615222147_alter_column_article_versions_end_date.rb
deleted file mode 100644
index 733ce28..0000000
--- a/db/migrate/20150615222147_alter_column_article_versions_end_date.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/db/migrate/20150615222204_alter_column_article_versions_start_date.rb b/db/migrate/20150615222204_alter_column_article_versions_start_date.rb
deleted file mode 100644
index 311aff1..0000000
--- a/db/migrate/20150615222204_alter_column_article_versions_start_date.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-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
--
libgit2 0.21.2