diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-11-30 01:33:31 -0500 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-11-30 01:33:31 -0500 |
| commit | 438045c0e0cedcf615bf4353cc34e7bb1ea51739 (patch) | |
| tree | 5b71e919bc993dcf98297af5435fe813acacde62 | |
| parent | 89bfd473640b45a755270f536f6f011027ef3128 (diff) | |
| download | askbot-438045c0e0cedcf615bf4353cc34e7bb1ea51739.tar.gz askbot-438045c0e0cedcf615bf4353cc34e7bb1ea51739.tar.bz2 askbot-438045c0e0cedcf615bf4353cc34e7bb1ea51739.zip | |
fixed use of badge constants
| -rw-r--r-- | askbot/models/__init__.py | 7 | ||||
| -rw-r--r-- | askbot/views/readers.py | 21 |
2 files changed, 13 insertions, 15 deletions
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 426ff582..6a1d385f 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -28,7 +28,6 @@ from askbot.models.user import EmailFeedSetting, ActivityAuditStatus, Activity from askbot.models import signals #from user import AuthKeyUserAssociation from askbot.models.repute import BadgeData, Award, Repute -from askbot.models import badges from askbot import auth from askbot.utils.decorators import auto_now_timestamp from askbot.utils.slug import slugify @@ -1756,11 +1755,11 @@ def record_award_event(instance, created, **kwargs): instance.badge.awarded_count += 1 instance.badge.save() - if instance.badge.type == badges.GOLD: + if instance.badge.type == const.GOLD_BADGE: instance.user.gold += 1 - if instance.badge.type == badges.SILVER: + if instance.badge.type == const.SILVER_BADGE: instance.user.silver += 1 - if instance.badge.type == badges.BRONZE: + if instance.badge.type == const.BRONZE_BADGE: instance.user.bronze += 1 instance.user.save() diff --git a/askbot/views/readers.py b/askbot/views/readers.py index 1f670c2c..92228912 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -32,7 +32,6 @@ from askbot.utils.html import sanitize_html from askbot.utils.diff import textDiff as htmldiff from askbot.forms import AdvancedSearchForm, AnswerForm from askbot import models -from askbot.models import badges from askbot import const from askbot import auth from askbot.utils import markup @@ -182,7 +181,7 @@ def questions(request): 'faces': list() } - badge_levels = dict(badges.TYPE_CHOICES) + badge_levels = dict(const.BADGE_TYPE_CHOICES) def pluralize_badge_count(count, level): return ungettext( '%(badge_count)d %(badge_level)s badge', @@ -193,9 +192,9 @@ def questions(request): 'badge_level': badge_levels[level] } - gold_badge_css_class = badges.CSS_CLASSES[badges.GOLD], - silver_badge_css_class = badges.CSS_CLASSES[badges.SILVER], - bronze_badge_css_class = badges.CSS_CLASSES[badges.BRONZE], + gold_badge_css_class = const.BADGE_CSS_CLASSES[const.GOLD_BADGE], + silver_badge_css_class = const.BADGE_CSS_CLASSES[const.SILVER_BADGE], + bronze_badge_css_class = const.BADGE_CSS_CLASSES[const.BRONZE_BADGE], for tag in related_tags: tag_data = { @@ -250,23 +249,23 @@ def questions(request): 'u_gold': author.gold, 'u_gold_title': pluralize_badge_count( author.gold, - badges.GOLD + const.GOLD_BADGE ), - 'u_gold_badge_symbol': badges.DISPLAY_SYMBOL, + 'u_gold_badge_symbol': const.BADGE_DISPLAY_SYMBOL, 'u_gold_css_class': gold_badge_css_class, 'u_silver': author.silver, 'u_silver_title': pluralize_badge_count( author.silver, - badges.SILVER + const.SILVER_BADGE ), - 'u_silver_badge_symbol': badges.DISPLAY_SYMBOL, + 'u_silver_badge_symbol': const.BADGE_DISPLAY_SYMBOL, 'u_silver_css_class': silver_badge_css_class, 'u_bronze': author.bronze, 'u_bronze_title': pluralize_badge_count( author.bronze, - badges.BRONZE + const.BRONZE_BADGE ), - 'u_bronze_badge_symbol': badges.DISPLAY_SYMBOL, + 'u_bronze_badge_symbol': const.BADGE_DISPLAY_SYMBOL, 'u_bronze_css_class': bronze_badge_css_class, } ajax_data['questions'].append(question_data) |