fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Widok do edycji dokumentów w aplikacji wiki.
[redakcja.git]
/
apps
/
explorer
/
middleware.py
diff --git
a/apps/explorer/middleware.py
b/apps/explorer/middleware.py
index
661a7a6
..
018f1aa
100644
(file)
--- a/
apps/explorer/middleware.py
+++ b/
apps/explorer/middleware.py
@@
-6,14
+6,18
@@
from django.utils import simplejson
from explorer import models
from explorer import models
+EDITOR_DEFAULT_SETTINGS_JSON = simplejson.dumps(settings.EDITOR_DEFAULT_SETTINGS)
+
+
class EditorSettingsMiddleware(object):
def process_request(self, request):
if request.user.is_anonymous():
return
class EditorSettingsMiddleware(object):
def process_request(self, request):
if request.user.is_anonymous():
return
- cookie_settings = request.COOKIES.get(settings.EDITOR_COOKIE_NAME,
'{}'
)
+ cookie_settings = request.COOKIES.get(settings.EDITOR_COOKIE_NAME,
EDITOR_DEFAULT_SETTINGS_JSON
)
cookie_settings = simplejson.loads(urllib.unquote(cookie_settings))
last_update = cookie_settings.get('lastUpdate', 0)
cookie_settings = simplejson.loads(urllib.unquote(cookie_settings))
last_update = cookie_settings.get('lastUpdate', 0)
+ cookie_settings['lastUpdate'] = last_update
try:
editor_settings = models.EditorSettings.objects.get(user=request.user)
try:
editor_settings = models.EditorSettings.objects.get(user=request.user)
@@
-24,7
+28,6
@@
class EditorSettingsMiddleware(object):
# print editor_settings.get_settings_value()['lastUpdate'], '<>', last_update
if editor_settings.get_settings_value()['lastUpdate'] < last_update:
# print editor_settings.get_settings_value()['lastUpdate'], '<>', last_update
if editor_settings.get_settings_value()['lastUpdate'] < last_update:
- print "\n\nZmiana!\n\n"
editor_settings.set_settings_value(cookie_settings)
editor_settings.save()
editor_settings.set_settings_value(cookie_settings)
editor_settings.save()