diff options
-rw-r--r-- | askbot/forms.py | 8 | ||||
-rw-r--r-- | askbot/models/__init__.py | 5 | ||||
-rw-r--r-- | askbot/models/post.py | 2 | ||||
-rw-r--r-- | askbot/models/question.py | 2 | ||||
-rw-r--r-- | askbot/models/tag.py | 11 | ||||
-rw-r--r-- | askbot/tests/db_api_tests.py | 2 | ||||
-rw-r--r-- | askbot/views/users.py | 3 |
7 files changed, 11 insertions, 22 deletions
diff --git a/askbot/forms.py b/askbot/forms.py index 0659e338..1c5bc3d6 100644 --- a/askbot/forms.py +++ b/askbot/forms.py @@ -12,7 +12,6 @@ from django.contrib.auth.models import User from django_countries import countries from askbot.utils.forms import NextUrlField, UserNameField from askbot.mail import extract_first_email_address -from askbot.models.tag import get_groups from recaptcha_works.fields import RecaptchaField from askbot.conf import settings as askbot_settings from askbot.conf import get_tag_display_filter_strategy_choices @@ -958,10 +957,10 @@ class CreateAskWidgetForm(forms.Form, FormWithHideableFields): ) def __init__(self, *args, **kwargs): - from askbot.models import Tag + from askbot.models import Group, Tag super(CreateAskWidgetForm, self).__init__(*args, **kwargs) self.fields['group'] = forms.ModelChoiceField( - queryset=get_groups().exclude_personal(), + queryset=Group.objects.exclude_personal(), required=False ) self.fields['tag'] = forms.ModelChoiceField(queryset=Tag.objects.get_content_tags(), @@ -985,10 +984,11 @@ class CreateQuestionWidgetForm(forms.Form, FormWithHideableFields): ) def __init__(self, *args, **kwargs): + from askbot.models import Group super(CreateQuestionWidgetForm, self).__init__(*args, **kwargs) self.fields['tagnames'] = TagNamesField() self.fields['group'] = forms.ModelChoiceField( - queryset=get_groups().exclude(name__startswith='_internal'), + queryset=Group.objects.exclude(name__startswith='_internal'), required=False ) diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 9c9880b2..fc1e1f3c 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -41,7 +41,6 @@ from askbot.models.question import QuestionView, AnonymousQuestion from askbot.models.question import DraftQuestion from askbot.models.question import FavoriteQuestion from askbot.models.tag import Tag, MarkedTag -from askbot.models.tag import get_groups from askbot.models.tag import format_personal_group_name from askbot.models.user import EmailFeedSetting, ActivityAuditStatus, Activity from askbot.models.user import GroupMembership @@ -2261,7 +2260,7 @@ def user_get_foreign_groups(self): """returns a query set of groups to which user does not belong""" #todo: maybe cache this query user_group_ids = self.get_groups().values_list('id', flat = True) - return get_groups().exclude(id__in = user_group_ids) + return Group.objects.exclude(id__in = user_group_ids) def user_get_primary_group(self): """a temporary function - returns ether None or @@ -3657,6 +3656,4 @@ __all__ = [ 'ReplyAddress', 'get_model', - 'get_group_names', - 'get_groups' ] diff --git a/askbot/models/post.py b/askbot/models/post.py index 85628f55..36bc5037 100644 --- a/askbot/models/post.py +++ b/askbot/models/post.py @@ -30,7 +30,7 @@ from askbot.models.user import EmailFeedSetting from askbot.models.user import Group from askbot.models.user import GroupMembership from askbot.models.tag import Tag, MarkedTag -from askbot.models.tag import get_groups, tags_match_some_wildcard +from askbot.models.tag import tags_match_some_wildcard from askbot.conf import settings as askbot_settings from askbot import exceptions from askbot.utils import markup diff --git a/askbot/models/question.py b/askbot/models/question.py index 76411ffa..e3f9146b 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -17,12 +17,10 @@ from askbot.conf import settings as askbot_settings from askbot import mail from askbot.mail import messages from askbot.models.tag import Tag -from askbot.models.tag import get_groups from askbot.models.tag import get_tags_by_names from askbot.models.tag import filter_accepted_tags, filter_suggested_tags from askbot.models.tag import delete_tags, separate_unused_tags from askbot.models.base import DraftContent, BaseQuerySetManager -from askbot.models.tag import Tag, get_groups from askbot.models.post import Post, PostRevision from askbot.models.post import PostToGroup from askbot.models.user import Group, PERSONAL_GROUP_NAME_PREFIX diff --git a/askbot/models/tag.py b/askbot/models/tag.py index 0c029d27..d7e91eb5 100644 --- a/askbot/models/tag.py +++ b/askbot/models/tag.py @@ -262,7 +262,8 @@ class TagManager(BaseQuerySetManager): return created_tags def clean_group_name(name): - """group names allow spaces, + """todo: move to the models/user.py + group names allow spaces, tag names do not, so we use this method to replace spaces with dashes""" return re.sub('\s+', '-', name.strip()) @@ -317,11 +318,3 @@ class MarkedTag(models.Model): class Meta: app_label = 'askbot' - -def get_groups(): - from askbot.models import Group - return Group.objects.all() - -def get_group_names(): - #todo: cache me - return get_groups().values_list('name', flat = True) diff --git a/askbot/tests/db_api_tests.py b/askbot/tests/db_api_tests.py index 0af6d955..232b847a 100644 --- a/askbot/tests/db_api_tests.py +++ b/askbot/tests/db_api_tests.py @@ -185,6 +185,8 @@ class DBApiTests(AskbotTestCase): self.assertTrue(saved_question.thread.answer_count == 1) def test_unused_tag_is_auto_deleted(self): + import pdb + pdb.set_trace() self.user.retag_question(self.question, tags='one-tag') tag = models.Tag.objects.get(name='one-tag') self.assertEquals(tag.used_count, 1) diff --git a/askbot/views/users.py b/askbot/views/users.py index b30e546d..b89e46cb 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -39,7 +39,6 @@ from askbot.conf import settings as askbot_settings from askbot import models from askbot import exceptions from askbot.models.badges import award_badges_signal -from askbot.models.tag import get_groups from askbot.models.tag import format_personal_group_name from askbot.skins.loaders import render_into_skin from askbot.search.state_manager import SearchState @@ -177,7 +176,7 @@ def show_users(request, by_group=False, group_id=None, group_slug=None): #extra context for the groups if askbot_settings.GROUPS_ENABLED: #todo: cleanup this branched code after groups are migrated to auth_group - user_groups = get_groups().exclude_personal() + user_groups = models.Group.objects.exclude_personal() if len(user_groups) <= 1: assert(user_groups[0].name == askbot_settings.GLOBAL_GROUP_NAME) user_groups = None |