diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-08-29 09:30:33 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-08-29 09:30:33 -0600 |
| commit | f39380e089ac30845589756f44b49e4e059fcf78 (patch) | |
| tree | 020accb3f25df5890d0dd2552635be094f4de2f3 /askbot/context.py | |
| parent | cac82a75d32938bd2c598e3b0c415bb269985e0a (diff) | |
| parent | 8278bbeffc5346800ee12c7fae41c1c2d3fd14f7 (diff) | |
| download | askbot-f39380e089ac30845589756f44b49e4e059fcf78.tar.gz askbot-f39380e089ac30845589756f44b49e4e059fcf78.tar.bz2 askbot-f39380e089ac30845589756f44b49e4e059fcf78.zip | |
Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groups
Conflicts:
askbot/context.py
askbot/models/post.py
askbot/models/tag.py
askbot/tests/db_api_tests.py
askbot/views/users.py
Diffstat (limited to 'askbot/context.py')
| -rw-r--r-- | askbot/context.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/askbot/context.py b/askbot/context.py index 30718972..2dace3eb 100644 --- a/askbot/context.py +++ b/askbot/context.py @@ -59,10 +59,9 @@ def application_settings(request): } if askbot_settings.GROUPS_ENABLED: - groups = models.Tag.group_tags.get_all().filter( - deleted=False - ).exclude( - name__startswith='_internal_').values('id', 'name') + groups = models.Group.objects.exclude( + name__startswith='_internal_' + ).values('id', 'name') group_list = [] for group in groups: group_slug = slugify(group['name']) |