mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of http://git.general-servers.com/expomap/expomap

Browse Source
remotes/origin/1203
Nazar Kotjuk 10 years ago
parent aea53b2da9 9f1f988191
commit e07b2dbe0c
6 changed files with 50 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      article/managers.py
  2. 20
      country/manager.py
  3. 7
      emencia/django/newsletter/forms.py
  4. 28
      functions/models_methods.py
  5. 2
      settings/management/commands/update_views_cache.py
  6. 24
      theme/manager.py

12
article/managers.py
Unescape View File

@ -26,10 +26,10 @@ class ArticleManager(TranslationManager):
model = self.model model = self.model
return self.language().filter(type=model.blog) return self.language().filter(type=model.blog)
def main_page_news(self): def main_page_news(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'main_page_news_%s'%lang key = 'main_page_news_%s' % lang
if key in cache: if cached and key in cache:
cached_news = cache.get(key) cached_news = cache.get(key)
return cached_news return cached_news
else: else:
@ -37,10 +37,10 @@ class ArticleManager(TranslationManager):
cache.set(key, news, self.cache_time) cache.set(key, news, self.cache_time)
return news return news
def main_page_blogs(self): def main_page_blogs(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'main_page_blogs_%s'%lang key = 'main_page_blogs_%s' % lang
if key in cache: if cached and key in cache:
cached_blogs = cache.get(key) cached_blogs = cache.get(key)
return cached_blogs return cached_blogs
else: else:

20
country/manager.py
Unescape View File

@ -14,11 +14,11 @@ class CountryManager(TranslationManager):
except: except:
return None return None
def expo_countries(self): def expo_countries(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_expo_countries_%s'%lang key = 'used_expo_countries_%s'%lang
cached_countries = cache.get(key) cached_countries = cache.get(key)
if cached_countries: if cached and cached_countries:
return cached_countries return cached_countries
else: else:
from exposition.models import Exposition from exposition.models import Exposition
@ -27,11 +27,11 @@ class CountryManager(TranslationManager):
cache.set(key, countries, self.cache_time) cache.set(key, countries, self.cache_time)
return countries return countries
def expo_countries_with_count(self): def expo_countries_with_count(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_expo_countries_count_%s'%lang key = 'used_expo_countries_count_%s'%lang
cached_countries = cache.get(key) cached_countries = cache.get(key)
if cached_countries: if cached and cached_countries:
return cached_countries return cached_countries
else: else:
@ -50,11 +50,11 @@ class CountryManager(TranslationManager):
cache.set(key, countries, self.cache_time) cache.set(key, countries, self.cache_time)
return countries return countries
def conference_countries_with_count(self): def conference_countries_with_count(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_conference_countries_count_%s'%lang key = 'used_conference_countries_count_%s'%lang
cached_countries = cache.get(key) cached_countries = cache.get(key)
if cached_countries: if cached and cached_countries:
return cached_countries return cached_countries
else: else:
@ -73,11 +73,11 @@ class CountryManager(TranslationManager):
cache.set(key, countries, self.cache_time) cache.set(key, countries, self.cache_time)
return countries return countries
def conference_countries(self): def conference_countries(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_conference_countries_%s'%lang key = 'used_conference_countries_%s'%lang
cached_countries = cache.get(key) cached_countries = cache.get(key)
if cached_countries: if cached and cached_countries:
return cached_countries return cached_countries
else: else:
from conference.models import Conference from conference.models import Conference
@ -97,13 +97,13 @@ class CountryManager(TranslationManager):
class AreaManager(TranslationManager): class AreaManager(TranslationManager):
cache_time = 55 cache_time = 55
def all_sorted(self): def all_sorted(self, cached=True):
""" """
return list, not queryset return list, not queryset
""" """
lang = translation.get_language() lang = translation.get_language()
key = 'country_area_all_%s' % lang key = 'country_area_all_%s' % lang
if key in cache: if cached and key in cache:
result = cache.get(key) result = cache.get(key)
else: else:
model = self.model model = self.model

7
emencia/django/newsletter/forms.py
Unescape View File

@ -159,15 +159,22 @@ class ContactFilterForm(forms.Form):
if self.cleaned_data.get('not_active'): if self.cleaned_data.get('not_active'):
title = ' not active ' + title title = ' not active ' + title
qs = qs.filter(activated=False) qs = qs.filter(activated=False)
else:
qs = qs.filter(activated=True)
if self.cleaned_data.get('not_valid'): if self.cleaned_data.get('not_valid'):
title = 'not valid e-mail ' + title title = 'not valid e-mail ' + title
qs = qs.filter(valid=False) qs = qs.filter(valid=False)
else:
qs = qs.filter(valid=True)
if self.cleaned_data.get("created_from"): if self.cleaned_data.get("created_from"):
qs = qs.filter(creation_date__gte=datetime.strptime(self.cleaned_data['created_from'], "%d.%m.%Y")) qs = qs.filter(creation_date__gte=datetime.strptime(self.cleaned_data['created_from'], "%d.%m.%Y"))
if self.cleaned_data.get("created_to"): if self.cleaned_data.get("created_to"):
qs = qs.filter(creation_date__lt=datetime.strptime(self.cleaned_data['created_to'], "%d.%m.%Y")) qs = qs.filter(creation_date__lt=datetime.strptime(self.cleaned_data['created_to'], "%d.%m.%Y"))
if self.cleaned_data.get('not_subscriber'): if self.cleaned_data.get('not_subscriber'):
qs = qs.filter(subscriber=False) qs = qs.filter(subscriber=False)
else:
qs = qs.filter(subscriber=True)
qs = qs.distinct() qs = qs.distinct()
return qs, title return qs, title

28
functions/models_methods.py
Unescape View File

@ -25,10 +25,10 @@ class ExpoManager(TranslationManager):
except: except:
return None return None
def expo_main(self): def expo_main(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'expo_main_page_key_%s'%lang key = 'expo_main_page_key_%s'%lang
if key in cache: if cached and key in cache:
result = cache.get(key) result = cache.get(key)
else: else:
result = list(self.language(lang). result = list(self.language(lang).
@ -40,10 +40,10 @@ class ExpoManager(TranslationManager):
return result return result
def conf_main(self): def conf_main(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'conf_main_page_key_%s'%lang key = 'conf_main_page_key_%s'%lang
if key in cache: if cached and key in cache:
result = cache.get(key) result = cache.get(key)
else: else:
result = list(self.language(lang). result = list(self.language(lang).
@ -71,10 +71,10 @@ class CityManager(TranslationManager):
cities_id = [item['city_id'] for item in Exposition.objects.values('city_id').distinct()] cities_id = [item['city_id'] for item in Exposition.objects.values('city_id').distinct()]
return self.language().filter(id__in=cities_id) return self.language().filter(id__in=cities_id)
def expo_cities(self): def expo_cities(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_expo_cities_%s' % lang key = 'used_expo_cities_%s' % lang
if key in cache: if cached and key in cache:
cached_cities = cache.get(key) cached_cities = cache.get(key)
return cached_cities return cached_cities
else: else:
@ -84,10 +84,10 @@ class CityManager(TranslationManager):
cache.set(key, cities, self.cache_time) cache.set(key, cities, self.cache_time)
return cities return cities
def expo_cities_with_count(self): def expo_cities_with_count(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_expo_cities_count_%s' % lang key = 'used_expo_cities_count_%s' % lang
if key in cache: if cached and key in cache:
cached_cities = cache.get(key) cached_cities = cache.get(key)
return cached_cities return cached_cities
else: else:
@ -106,10 +106,10 @@ class CityManager(TranslationManager):
cache.set(key, cities, self.cache_time) cache.set(key, cities, self.cache_time)
return cities return cities
def conference_cities_with_count(self): def conference_cities_with_count(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_conference_cities_count_%s' % lang key = 'used_conference_cities_count_%s' % lang
if key in cache: if cached and key in cache:
cached_cities = cache.get(key) cached_cities = cache.get(key)
return cached_cities return cached_cities
else: else:
@ -129,10 +129,10 @@ class CityManager(TranslationManager):
cache.set(key, cities, self.cache_time) cache.set(key, cities, self.cache_time)
return cities return cities
def conference_cities(self): def conference_cities(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_conference_cities_%s'%lang key = 'used_conference_cities_%s'%lang
if key in cache: if cached and key in cache:
cached_cities = cache.get(key) cached_cities = cache.get(key)
return cached_cities return cached_cities
else: else:
@ -142,13 +142,13 @@ class CityManager(TranslationManager):
cache.set(key, cities, self.cache_time) cache.set(key, cities, self.cache_time)
return cities return cities
def cities(self): def cities(self, cached=True):
""" """
not finished not finished
""" """
lang = translation.get_language() lang = translation.get_language()
key = 'used_cities_%s'%lang key = 'used_cities_%s'%lang
if key in cache: if cached and key in cache:
cached_cities = cache.get(key) cached_cities = cache.get(key)
return cached_cities return cached_cities
else: else:

2
settings/management/commands/update_views_cache.py
Unescape View File

@ -44,5 +44,5 @@ class Command(BaseCommand):
key = k % lang key = k % lang
print(key) print(key)
result = func() result = func(cached=False)
cache.set(key, result, CACHE_TIME) cache.set(key, result, CACHE_TIME)

24
theme/manager.py
Unescape View File

@ -26,11 +26,11 @@ class ThemeActiveManager(TranslationManager):
Model = self.model Model = self.model
return list(self.language().filter(types=Model.types.conference)[:6]) return list(self.language().filter(types=Model.types.conference)[:6])
def expo_themes(self): def expo_themes(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_expo_themes_%s'%lang key = 'used_expo_themes_%s'%lang
cached_themes = cache.get(key) cached_themes = cache.get(key)
if cached_themes: if cached and cached_themes:
return cached_themes return cached_themes
else: else:
from exposition.models import Exposition from exposition.models import Exposition
@ -39,11 +39,11 @@ class ThemeActiveManager(TranslationManager):
cache.set(key, themes, 300) cache.set(key, themes, 300)
return themes return themes
def expo_themes_with_count(self): def expo_themes_with_count(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_expo_themes_count_%s'%lang key = 'used_expo_themes_count_%s'%lang
cached_themes = cache.get(key) cached_themes = cache.get(key)
if cached_themes: if cached and cached_themes:
return cached_themes return cached_themes
else: else:
@ -57,11 +57,11 @@ class ThemeActiveManager(TranslationManager):
cache.set(key, themes, self.cache_time) cache.set(key, themes, self.cache_time)
return themes return themes
def conference_themes_with_count(self): def conference_themes_with_count(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_conference_themes_count_%s'%lang key = 'used_conference_themes_count_%s'%lang
cached_themes = cache.get(key) cached_themes = cache.get(key)
if cached_themes: if cached and cached_themes:
return cached_themes return cached_themes
else: else:
from conference.models import Conference from conference.models import Conference
@ -102,11 +102,11 @@ class TagActiveManager(TranslationManager):
cache.set(key, tags, 300) cache.set(key, tags, 300)
return tags return tags
def conference_tags(self): def conference_tags(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_conference_tags_%s'%lang key = 'used_conference_tags_%s'%lang
cached_tags = cache.get(key) cached_tags = cache.get(key)
if cached_tags: if cached and cached_tags:
return cached_tags return cached_tags
else: else:
from conference.models import Conference from conference.models import Conference
@ -119,11 +119,11 @@ class TagActiveManager(TranslationManager):
cache.set(key, tags, self.cache_time) cache.set(key, tags, self.cache_time)
return tags return tags
def expo_themes_with_count(self): def expo_themes_with_count(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_expo_tags_count_%s'%lang key = 'used_expo_tags_count_%s'%lang
cached_tags = cache.get(key) cached_tags = cache.get(key)
if cached_tags: if cached and cached_tags:
return cached_tags return cached_tags
else: else:
@ -137,11 +137,11 @@ class TagActiveManager(TranslationManager):
cache.set(key, tags, self.cache_time) cache.set(key, tags, self.cache_time)
return tags return tags
def conference_themes_with_count(self): def conference_themes_with_count(self, cached=True):
lang = translation.get_language() lang = translation.get_language()
key = 'used_conference_tags_count_%s'%lang key = 'used_conference_tags_count_%s'%lang
cached_tags = cache.get(key) cached_tags = cache.get(key)
if cached_tags: if cached and cached_tags:
return cached_tags return cached_tags
else: else:
from conference.models import Conference from conference.models import Conference

Write Preview
Loading…
Cancel
Save