Merge branch 'master' of https://github.com/HausdorffHimself/fetsite

2013-08-23 14:30:31 +02:00
parent 0ca18d1f84 adbbce5fc8
commit 032504d0e3
7 changed files with 62 additions and 34 deletions
--- a/app/models/themengruppe.rb
+++ b/app/models/themengruppe.rb
@@ -11,9 +11,10 @@

 class Themengruppe < ActiveRecord::Base
  WORD_COUNT = 50
-  attr_accessible :text, :title
+  attr_accessible :text, :title, :picture
  has_many :themen, class_name: 'Thema'
  has_many :fragen, through: :themen
+  mount_uploader :picture, PictureUploader
  
  validates :title, :presence => true