From 937f0389f4bf2b120080aa5aa6e024d42cc8a051 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sun, 4 Dec 2011 21:07:13 +0100 Subject: [PATCH] bug suppression image galerie --- app/models/manager/image_file.rb | 3 ++- app/models/portlets/gallery_image.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/manager/image_file.rb b/app/models/manager/image_file.rb index 99dd293..40701e1 100644 --- a/app/models/manager/image_file.rb +++ b/app/models/manager/image_file.rb @@ -1,7 +1,8 @@ # -*- encoding : utf-8 -*- class ImageFile < ActiveRecord::Base mount_uploader :file, ImageUploader - + has_many :gallery_images, :dependent => :destroy + before_save do if !self.name? self.name = File.basename(self.file.filename, File.extname(self.file.filename)).to_s if self.file? diff --git a/app/models/portlets/gallery_image.rb b/app/models/portlets/gallery_image.rb index 5ade930..84d110c 100644 --- a/app/models/portlets/gallery_image.rb +++ b/app/models/portlets/gallery_image.rb @@ -1,6 +1,6 @@ # -*- encoding : utf-8 -*- class GalleryImage < ActiveRecord::Base - belongs_to :image_file, :dependent => :destroy + belongs_to :image_file belongs_to :gallery validates :title, :presence => true