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

2013-08-20 13:58:20 +02:00
parent d96a694a73 65b0ad8c19
commit 0a910386d7
13 changed files with 68 additions and 26 deletions
--- a/app/models/frage.rb
+++ b/app/models/frage.rb
@@ -1,5 +1,5 @@
 class Frage < ActiveRecord::Base
-  attr_accessible :text, :title
+  attr_accessible :text, :title, :thema_id
  belongs_to :thema
  
  validates :thema, :presence => true
--- a/app/models/themengruppe.rb
+++ b/app/models/themengruppe.rb
@@ -1,4 +1,5 @@
 class Themengruppe < ActiveRecord::Base
+  WORD_COUNT = 50
  attr_accessible :text, :title
  has_many :themen, class_name: 'Thema'
  has_many :fragen, through: :themen