summaryrefslogtreecommitdiff
path: root/ishtar_common/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-02-18 13:10:24 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-02-18 13:10:24 +0100
commit303110c526124e76ea40cf4abaad3bd4a5223104 (patch)
treeabac5732281694b364c299124a53f2cf446f572c /ishtar_common/models.py
parent6a868f55d08cd9be71be95af6617abdcab80a57c (diff)
downloadIshtar-303110c526124e76ea40cf4abaad3bd4a5223104.tar.bz2
Ishtar-303110c526124e76ea40cf4abaad3bd4a5223104.zip
Update tests for module management
Diffstat (limited to 'ishtar_common/models.py')
-rw-r--r--ishtar_common/models.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 0b1f42460..77a9bf868 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -42,7 +42,7 @@ from django.core.urlresolvers import reverse, NoReverseMatch
from django.db.utils import DatabaseError
from django.db.models import Q, Max, Count
from django.db.models.base import ModelBase
-from django.db.models.signals import post_save, pre_delete
+from django.db.models.signals import post_save, pre_delete, post_delete
from django.utils.translation import ugettext_lazy as _, ugettext, \
pgettext_lazy
@@ -801,7 +801,7 @@ class IshtarSiteProfile(models.Model, Cached):
obj = self
if raw:
return obj
- q = self.__class__.objects.filter(active=True).exclude(pk=self.pk)
+ q = self.__class__.objects.filter(active=True).exclude(slug=self.slug)
if obj.active and q.count():
for profile in q.all():
profile.active = False
@@ -822,7 +822,7 @@ class IshtarSiteProfile(models.Model, Cached):
def get_current_profile(force=False):
- cache_key, value = get_cache(IshtarSiteProfile, 'is-current-profile')
+ cache_key, value = get_cache(IshtarSiteProfile, ['is-current-profile'])
if value and not force:
return value
q = IshtarSiteProfile.objects.filter(active=True)
@@ -836,11 +836,10 @@ def get_current_profile(force=False):
def cached_site_changed(sender, **kwargs):
- if not kwargs['instance']:
- return
get_current_profile(force=True)
post_save.connect(cached_site_changed, sender=IshtarSiteProfile)
+post_delete.connect(cached_site_changed, sender=IshtarSiteProfile)
class GlobalVar(models.Model, Cached):