diff --git a/app/models/principal.rb b/app/models/principal.rb index 56da6d9c7..6ea19e60d 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -136,6 +136,10 @@ class Principal < ApplicationRecord nil end + def active? + self.status == STATUS_ACTIVE + end + def visible?(user=User.current) Principal.visible(user).find_by(:id => id) == self end diff --git a/app/models/user.rb b/app/models/user.rb index ee1303d41..42683554a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -273,10 +273,6 @@ class User < Principal end end - def active? - self.status == STATUS_ACTIVE - end - def registered? self.status == STATUS_REGISTERED end diff --git a/test/unit/group_test.rb b/test/unit/group_test.rb index 0e5288f1b..59923927c 100644 --- a/test/unit/group_test.rb +++ b/test/unit/group_test.rb @@ -38,6 +38,7 @@ class GroupTest < ActiveSupport::TestCase assert g.save g.reload assert_equal 'New group', g.name + assert_equal true, g.active? end def test_name_should_accept_255_characters