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

2013-08-19 20:58:39 +02:00
parent e50deccf7f d96a694a73
commit 0df72b9df1
10 changed files with 60 additions and 27 deletions
--- a/app/models/foto.rb
+++ b/app/models/foto.rb
@@ -1,3 +1,6 @@
 class Foto < ActiveRecord::Base
  attr_accessible :datei, :desc, :gallery_id, :title
+  belongs_to :gallery
+  mount_uploader :datei, FotoUploader
+  
 end
--- a/app/models/gallery.rb
+++ b/app/models/gallery.rb
@@ -1,3 +1,4 @@
 class Gallery < ActiveRecord::Base
  attr_accessible :datum, :desc, :name
+  has_many :fotos
 end