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

Conflicts:
	app/controllers/neuigkeiten_controller.rb
	config/routes.rb

app/models/fetmeeting.rb

@@ -0,0 +1,11 @@
+class Fetmeeting < ActiveRecord::Base
+  attr_accessible :tnlist, :typ, :calentry_attributes
+  has_many :fetmeetingtops
+  validates :typ, presence: true 
+  validates :calentry, presence: true	
+  has_one :calentry , as: :object 
+  accepts_nested_attributes_for :calentry
+  def public 
+    true
+  end		
+end

app/models/fetmeetingtop.rb

@@ -0,0 +1,7 @@
+class Fetmeetingtop < ActiveRecord::Base
+  attr_accessible :discussion, :ersteller, :fetmeeting_id, :text, :title
+  belongs_to :fetmeeting
+  validates :fetmeeting, presence: true 
+  validates :title, presence: true , length:{minimum: 4}
+  validates :ersteller, presence: true
+end