diff --git a/app/models/reseaux.rb b/app/models/reseaux.rb index fe49e7d..dbd1d9a 100644 --- a/app/models/reseaux.rb +++ b/app/models/reseaux.rb @@ -4,16 +4,16 @@ class Reseaux < ActiveRecord::Base belongs_to :logo_image_file, :class_name => "ImageFile" belongs_to :background_image_file, :class_name => "ImageFile" - has_many :reseaux_customers + has_many :reseaux_customers, :dependent => :destroy has_many :customers, :through => :reseaux_customers has_many :domains, :through => :customers has_many :needs, :through => :customers - has_many :offer_reseauxes + has_many :offer_reseauxes, :dependent => :destroy has_many :offers, :through => :offer_reseauxes - has_many :thing_conversations, :as => :thing + has_many :thing_conversations, :as => :thing, :dependent => :destroy has_many :conversations, :through => :thing_conversations diff --git a/app/views/admin/reseauxes/_reseaux.html.haml b/app/views/admin/reseauxes/_reseaux.html.haml index 63c65c4..0043553 100755 --- a/app/views/admin/reseauxes/_reseaux.html.haml +++ b/app/views/admin/reseauxes/_reseaux.html.haml @@ -13,6 +13,6 @@ %td.actions{:style => "width:150px;text-align:right"} - = link_to i(:"trash-o"), [:admin, reseaux], :data => {:confirm => 'Voulez-vous vraiment supprimer ce reseauxe ?'}, :method => :delete + = link_to i(:"trash-o"), [:admin, reseaux], :data => {:confirm => 'Voulez-vous vraiment supprimer ce reseaux ? ATTENTION : les pertes de données dépendantes de ce réseaux (y compris les commandes) seront irreverssibles.'}, :method => :delete = link_to i(:pencil), edit_admin_reseaux_path(reseaux) = link_to i(:eye), admin_reseaux_path(reseaux) diff --git a/app/views/public/products/_product.html.haml b/app/views/public/products/_product.html.haml index e7f77b4..5b570d6 100755 --- a/app/views/public/products/_product.html.haml +++ b/app/views/public/products/_product.html.haml @@ -1,6 +1,6 @@ =link_to public_reseaux_product_path(:reseaux_id => params[:reseaux_id],:id => product.id, :slug => product.lang(I18n.locale).slug) do .product.product-item - .inner + .inner.with_ratio{:data => {:ratio => "1.4"}} =image_tag product.default_image.image_file.file.large.medium.url if product.default_image .description