X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7fa400fc50e17b3c017615b296934945531fa715..11014041527e050c889dfb8899e0fb87945b5513:/forum/models/tag.py diff --git a/forum/models/tag.py b/forum/models/tag.py index 5b6bef3..73b1e30 100644 --- a/forum/models/tag.py +++ b/forum/models/tag.py @@ -1,7 +1,10 @@ import datetime from base import * +from django.conf import settings as django_settings +from django.core.cache.backends.base import BaseCache from django.utils.translation import ugettext as _ +from django.utils.encoding import smart_unicode, force_unicode from forum import modules @@ -26,7 +29,7 @@ class Tag(BaseModel): app_label = 'forum' def __unicode__(self): - return self.name + return force_unicode(self.name) def add_to_usage_count(self, value): if self.used_count + value < 0: @@ -44,7 +47,12 @@ class Tag(BaseModel): @classmethod def infer_cache_key(cls, querydict): if 'name' in querydict: - return cls._generate_cache_key(cls.safe_cache_name(querydict['name'])) + cache_key = cls._generate_cache_key(cls.safe_cache_name(querydict['name'])) + + if len(cache_key) > django_settings.CACHE_MAX_KEY_LENGTH: + cache_key = cache_key[:django_settings.CACHE_MAX_KEY_LENGTH] + + return cache_key return None