diff --git a/app/models/gallery.rb b/app/models/gallery.rb index 9371f2d..2dcbadc 100644 --- a/app/models/gallery.rb +++ b/app/models/gallery.rb @@ -13,7 +13,7 @@ class Gallery < ActiveRecord::Base WORD_COUNT = 20 attr_accessible :datum, :desc, :name, :foto_ids - has_many :fotos + has_many :fotos, :dependent => :destroy # Delete fotos if gallery is destroyed has_many :nlinks, as: :link # scope :search, ->(query) {where("name like ? or galleries.desc like ?", "%#{query}%", "%#{query}%")} searchable do diff --git a/app/views/galleries/_form.html.erb b/app/views/galleries/_form.html.erb index 9a63688..1e8d6e5 100644 --- a/app/views/galleries/_form.html.erb +++ b/app/views/galleries/_form.html.erb @@ -6,7 +6,7 @@ <%= f.input :name %> <%= f.input :desc %> <%= f.input :datum %> - <%= f.input :fotos,:label=>"test", :as=>:check_boxes, :member_label =>Proc.new{|u| u.title.html_safe+"
".html_safe+image_tag(u.datei.thumb.url,{:class=>"img-polaroid img-rounded"})}, :wrapper_html => {:class => "left"}%> + <% end %> <%= f.actions do %> @@ -16,5 +16,5 @@ - <%= @fotos_old %> +