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):
model = SliceMembership
extra = 0
+class SliceTagInline(admin.TabularInline):
+ model = SliceTag
+ extra = 0
+
class PlainTextWidget(forms.HiddenInput):
input_type = 'hidden'
class SliceAdmin(OSModelAdmin):
fields = ['name', 'site', 'serviceClass', 'description', 'slice_url']
list_display = ('name', 'site','serviceClass', 'slice_url')
- inlines = [SliverInline, SliceMembershipInline]
+ inlines = [SliverInline, SliceMembershipInline, SliceTagInline]
def queryset(self, request):
# admins can see all keys. Users can only see slices they belong to.
list_filter = ('site',)
inlines = [SitePrivilegeInline, SliceMembershipInline]
fieldsets = (
- (None, {'fields': ('email', 'password', 'site', 'is_admin')}),
+ (None, {'fields': ('email', 'password', 'site', 'is_admin', 'timezone')}),
('Personal info', {'fields': ('firstname','lastname','phone', 'key')}),
#('Important dates', {'fields': ('last_login',)}),
)
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':
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