From 9cd3312f2d703f4613655be0edc04486df3af855 Mon Sep 17 00:00:00 2001 From: lisovskey Date: Wed, 30 May 2018 11:59:17 +0300 Subject: [PATCH] delete fix --- app/models/project.rb | 7 +++---- app/models/user.rb | 2 +- app/views/devise/registrations/edit.html.erb | 8 +------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/models/project.rb b/app/models/project.rb index 230c106..445a527 100755 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -9,12 +9,11 @@ class Project < ApplicationRecord mount_uploader :avatar, AvatarUploader - belongs_to :user belongs_to :category - has_many :choices - has_many :donations - has_many :rewards + has_many :choices, dependent: :destroy + has_many :donations, dependent: :destroy + has_many :rewards, dependent: :destroy accepts_nested_attributes_for :rewards, allow_destroy: true diff --git a/app/models/user.rb b/app/models/user.rb index a71ff18..ad47f3b 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -9,7 +9,7 @@ class User < ApplicationRecord devise :database_authenticatable, :registerable, :recoverable, :rememberable, :validatable, :confirmable, :lockable - has_many :projects + has_many :projects, dependent: :destroy has_one :validation validates_presence_of :email, :encrypted_password, :first_name, :last_name, :wallet diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index e287dde..b5c4117 100755 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -58,18 +58,12 @@ -
+
<%= f.button t('.update'), class: "full-width waves-effect waves-light btn-large", data: {disable_with: I18n.t("form.wait")} %>
<% end %> - -
-
- <%= button_to t('.destroy'), registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "waves-effect btn-flat" %> -
-