diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-01-14 21:23:59 -0500 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-01-14 21:23:59 -0500 |
| commit | d1777563360257e6e83cdf08d25a5bef99117f05 (patch) | |
| tree | ccbf662bb06c1ff0763bfb2151050a263c7fa560 | |
| parent | f9d344daae88cf11de43a9517dcebfe6fb4be9ec (diff) | |
| download | askbot-d1777563360257e6e83cdf08d25a5bef99117f05.tar.gz askbot-d1777563360257e6e83cdf08d25a5bef99117f05.tar.bz2 askbot-d1777563360257e6e83cdf08d25a5bef99117f05.zip | |
removed use of the is_staff field anywhere
| -rw-r--r-- | askbot/importers/stackexchange/management/commands/load_stackexchange.py | 2 | ||||
| -rw-r--r-- | askbot/management/commands/add_admin.py | 1 | ||||
| -rw-r--r-- | askbot/management/commands/remove_admin.py | 1 | ||||
| -rw-r--r-- | askbot/models/__init__.py | 6 |
4 files changed, 4 insertions, 6 deletions
diff --git a/askbot/importers/stackexchange/management/commands/load_stackexchange.py b/askbot/importers/stackexchange/management/commands/load_stackexchange.py index 83c8c02f..52ed9167 100644 --- a/askbot/importers/stackexchange/management/commands/load_stackexchange.py +++ b/askbot/importers/stackexchange/management/commands/load_stackexchange.py @@ -747,7 +747,7 @@ class Command(BaseCommand): if u_type == 'Administrator': u.is_superuser = True elif u_type == 'Moderator': - u.is_staff = True + u.set_status('m') elif u_type not in ('Unregistered', 'Registered'): raise Exception('unknown user type %s' % u_type) diff --git a/askbot/management/commands/add_admin.py b/askbot/management/commands/add_admin.py index daf69f9c..3357cbad 100644 --- a/askbot/management/commands/add_admin.py +++ b/askbot/management/commands/add_admin.py @@ -42,5 +42,4 @@ class Command(NoArgsCommand): self.remove_signals() self.user.is_superuser = True - self.user.is_staff = True self.user.save() diff --git a/askbot/management/commands/remove_admin.py b/askbot/management/commands/remove_admin.py index b3f7665f..2ec895e7 100644 --- a/askbot/management/commands/remove_admin.py +++ b/askbot/management/commands/remove_admin.py @@ -42,5 +42,4 @@ class Command(NoArgsCommand): self.remove_signals() self.user.is_superuser = False - self.user.is_staff = False self.user.save() diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index ad709509..1bc42b89 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -1127,7 +1127,7 @@ def user_is_username_taken(cls,username): return False def user_is_administrator(self): - return (self.is_superuser or self.is_staff) + return self.is_superuser def user_is_moderator(self): return (self.status == 'm' and self.is_administrator() == False) @@ -1167,9 +1167,9 @@ def user_set_status(self, new_status): return #clear admin status if user was an administrator - if self.is_administrator: + #because this function is not dealing with the site admins + if self.is_administrator(): self.is_superuser = False - self.is_staff = False self.status = new_status self.save() |