diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-30 12:22:33 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-30 12:22:33 +0200 |
| commit | 24968d20a07d483cd36b4747bd1db8bd512002c2 (patch) | |
| tree | d306d08bc32edba292cf9aa85c3be8ba009c1b1c /app/models/instance.rb | |
| parent | f48c7689d230b915ed740a4774736bd5998cbc66 (diff) | |
| parent | b31b232edfcc7f04acf828bf6829ab716b290692 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock
Diffstat (limited to 'app/models/instance.rb')
| -rw-r--r-- | app/models/instance.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/instance.rb b/app/models/instance.rb index 797a191e0..3c740f8a2 100644 --- a/app/models/instance.rb +++ b/app/models/instance.rb @@ -7,8 +7,9 @@ class Instance def initialize(resource) @domain = resource.domain - @accounts_count = resource.is_a?(DomainBlock) ? nil : resource.accounts_count + @accounts_count = resource.respond_to?(:accounts_count) ? resource.accounts_count : nil @domain_block = resource.is_a?(DomainBlock) ? resource : DomainBlock.rule_for(domain) + @domain_allow = resource.is_a?(DomainAllow) ? resource : DomainAllow.rule_for(domain) end def countable? |