git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e444a00
)
use timezone setting in reservation pages
author
Scott Baker
<smbaker@gmail.com>
Sun, 19 May 2013 23:19:16 +0000
(16:19 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Sun, 19 May 2013 23:19:16 +0000
(16:19 -0700)
planetstack/core/admin.py
patch
|
blob
|
history
diff --git
a/planetstack/core/admin.py
b/planetstack/core/admin.py
index
85bed74
..
bc49b8a
100644
(file)
--- a/
planetstack/core/admin.py
+++ b/
planetstack/core/admin.py
@@
-9,7
+9,8
@@
from django.utils.safestring import mark_safe
from django.contrib.auth.admin import UserAdmin
from django.contrib.admin.widgets import FilteredSelectMultiple
from django.contrib.auth.forms import ReadOnlyPasswordHashField
from django.contrib.auth.admin import UserAdmin
from django.contrib.admin.widgets import FilteredSelectMultiple
from django.contrib.auth.forms import ReadOnlyPasswordHashField
-from django.contrib.auth.signals import user_logged_in
+from django.contrib.auth.signals import user_logged_in
+from django.utils import timezone
class ReadonlyTabularInline(admin.TabularInline):
class ReadonlyTabularInline(admin.TabularInline):
@@
-520,6
+521,7
@@
class ReservationAdmin(admin.ModelAdmin):
form = ReservationAddForm
def add_view(self, request, form_url='', extra_context=None):
form = ReservationAddForm
def add_view(self, request, form_url='', extra_context=None):
+ timezone.activate(request.user.timezone)
request._refresh = False
request._slice = None
if request.method == 'POST':
request._refresh = False
request._slice = None
if request.method == 'POST':
@@
-538,6
+540,10
@@
class ReservationAdmin(admin.ModelAdmin):
result = super(ReservationAdmin, self).add_view(request, form_url, extra_context)
return result
result = super(ReservationAdmin, self).add_view(request, form_url, extra_context)
return result
+ def changelist_view(self, request, extra_context = None):
+ timezone.activate(request.user.timezone)
+ return super(ReservationAdmin, self).changelist_view(request, extra_context)
+
def get_form(self, request, obj=None, **kwargs):
request._obj_ = obj
\r
if obj is not None:
\r
def get_form(self, request, obj=None, **kwargs):
request._obj_ = obj
\r
if obj is not None:
\r