diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 23:37:26 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 23:37:26 +0200 |
| commit | 076ce993f1524d646fae406cb493661312260b20 (patch) | |
| tree | 225b2da97e2bb7ada334b2e64510a348e6d35ab9 | |
| parent | 08f1fe99d11e40ca506469c1d782791fca18d49d (diff) | |
| parent | ebd964fb4bd78c1c295257a00aff29fcedb8160e (diff) | |
| download | Ishtar-076ce993f1524d646fae406cb493661312260b20.tar.bz2 Ishtar-076ce993f1524d646fae406cb493661312260b20.zip | |
Merge branch 'master' into v0.9
| -rw-r--r-- | CHANGES.md | 7 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 | ||||
| -rw-r--r-- | version.py | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md index 327894c03..fff3040bd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,13 @@ Ishtar changelog ================ +0.98.1 (2016-09-11) +------------------- + +### Bug fixes ### + +- Fix right caching + 0.98.0 (2016-09-11) ------------------- diff --git a/ishtar_common/models.py b/ishtar_common/models.py index e4a72eab7..f3f9f0778 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2520,7 +2520,7 @@ class IshtarUser(User): res = cache.get(cache_key) if res in (True, False): return res - res = super(IshtarUser, self).has_perm(perm, obj) + res = super(IshtarUser, self).has_perm(perm, model) cache.set(cache_key, res, settings.CACHE_SMALLTIMEOUT) return res diff --git a/version.py b/version.py index 454f45b60..6b7df7378 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 98, 0) +VERSION = (0, 98, 1) def get_version(): |