allow delete community

Children-in-Families · Dec 25, 2020 · 31095b2 · 31095b2
1 parent 63e6b38
commit 31095b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/controllers/communities_controller.rb b/app/controllers/communities_controller.rb
@@ -58,11 +58,11 @@ def update
   end
 
   def destroy
-    # if @community.current_clients.blank? && (@community.cases.present? && @community.cases.delete_all || true) && @community.destroy
-    #   redirect_to families_url, notice: t('.successfully_deleted')
-    # else
-    #   redirect_to family_path(@community), alert: t('.alert')
-    # end
+    if @community.destroy
+      redirect_to communities_path, notice: t('.successfully_deleted')
+    else
+      redirect_to community_path(@community), alert: t('.alert')
+    end
   end
 
   # def version

diff --git a/app/models/community_member.rb b/app/models/community_member.rb
@@ -12,7 +12,7 @@ class CommunityMember < ActiveRecord::Base
 
   enumerize :gender, in: ['female', 'male', 'lgbt', 'unknown', 'prefer_not_to_say', 'other'], scope: :shallow, predicates: { prefix: true }
 
-  after_commit :save_family_data
+  after_commit :save_family_data, if: :persisted?
 
   def self.update_family_relevant_data(family_member_id)
     find(family_member_id).save_family_data