delete fix

lisovskey · May 30, 2018 · 9cd3312 · 9cd3312
1 parent 49f4869
commit 9cd3312
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git 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
@@ -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
@@ -58,18 +58,12 @@
             </div>
           </div>
 
-          <div class="row">
+          <div class="row fix">
             <div class="col s12">
               <%= f.button t('.update'), class: "full-width waves-effect waves-light btn-large", data: {disable_with: I18n.t("form.wait")} %>
             </div>
           </div>
         <% end %>
-
-        <div class="row fix">
-          <div class="col s12 center-align">
-            <%= button_to t('.destroy'), registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "waves-effect btn-flat" %>
-          </div>
-        </div>
       </div>
     </div>
   </div>