[gentoo-commits] proj/council-webapp:master commit in: site/app/models/, site/

[Petteri Räty]

commit:     7b372216bb8dbd59c456006e0ea5b9c699107e0b
Author:     Joachim Filip Ignacy Bartosik <jbartosik <AT> gmail <DOT> com>
AuthorDate: Tue Jun 28 15:36:13 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 15:04:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/council-webapp.git;a=commit;h=7b372216

Allow markdown in agenda item body

Input is only one line high. This is fixed in newer hobo, but some
other, more serious problems are introduced.

---
 site/Gemfile                   |    1 +
 site/Gemfile.lock              |    2 ++
 site/app/models/agenda_item.rb |    2 +-
 3 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/site/Gemfile b/site/Gemfile
index a95faa0..2e090f4 100644
--- a/site/Gemfile
+++ b/site/Gemfile
@@ -4,6 +4,7 @@ gem 'sqlite3-ruby', :require => 'sqlite3'
 gem 'devise'
 gem 'hobo_devise', '>=0.0.2'
 gem 'delayed_job'
+gem 'bluecloth'
 
 group :development, :test do
   gem 'ruby-debug'

diff --git a/site/Gemfile.lock b/site/Gemfile.lock
index aca3ead..6d5bbb4 100644
--- a/site/Gemfile.lock
+++ b/site/Gemfile.lock
@@ -31,6 +31,7 @@ GEM
     addressable (2.2.5)
     arel (2.0.9)
     bcrypt-ruby (2.1.4)
+    bluecloth (2.1.0)
     builder (3.0.0)
     capybara (0.4.1.2)
       celerity (>= 0.7.9)
@@ -210,6 +211,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bluecloth
   capybara
   cucumber-rails
   database_cleaner

diff --git a/site/app/models/agenda_item.rb b/site/app/models/agenda_item.rb
index 0ce60ea..eaa6ede 100644
--- a/site/app/models/agenda_item.rb
+++ b/site/app/models/agenda_item.rb
@@ -5,7 +5,7 @@ class AgendaItem < ActiveRecord::Base
   fields do
     title      :string
     discussion :string
-    body       :text
+    body       :markdown
     rejected   :boolean, :default => false
     timelimits :text, :null => false, :default => ''
     timestamps