diff --git a/models/site.rb b/models/site.rb index ac219dc3..bf97c16e 100644 --- a/models/site.rb +++ b/models/site.rb @@ -208,7 +208,7 @@ class Site < Sequel::Model one_to_many :archives def account_sites_dataset - Site.where(Sequel.|({id: owner.id}, {parent_site_id: owner.id})).order(:parent_site_id.desc, :username) + Site.where(Sequel.|({id: owner.id}, {parent_site_id: owner.id})).order(:parent_site_id.desc, :username).exclude(is_deleted: true) end def account_sites diff --git a/views/settings/site/delete.erb b/views/settings/site/delete.erb index 4a36b756..20e81930 100644 --- a/views/settings/site/delete.erb +++ b/views/settings/site/delete.erb @@ -1,6 +1,6 @@

Delete Site

- <% if @site.parent? && @site.children.count > 0 %> + <% if @site.parent? && @site.children_dataset.where(is_deleted: false, is_deleted: false).count > 0 %>

You cannot delete the parent site without deleting the children sites first.