Skip to content
This repository has been archived by the owner on Oct 5, 2021. It is now read-only.

Commit

Permalink
fixed #286 detailed user list
Browse files Browse the repository at this point in the history
  • Loading branch information
FoxMaSk committed Apr 18, 2018
1 parent eb0fd26 commit 93eb4cd
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions django_th/admin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin
from django.contrib.auth.models import User

from django_th.forms.services import ServicesAdminForm
from django_th.models import ServicesActivated
Expand All @@ -17,8 +19,7 @@ def make_status_enable(self, request, queryset):
message_bit = "1 service was"
else:
message_bit = "%s services were" % rows_updated
self.message_user(
request, "%s successfully marked as enabled." % message_bit)
self.message_user(request, "%s successfully marked as enabled." % message_bit)

def make_status_disable(self, request, queryset):
rows_updated = queryset.update(status=False)
Expand All @@ -27,13 +28,11 @@ def make_status_disable(self, request, queryset):
message_bit = "1 service was"
else:
message_bit = "%s services were" % rows_updated
self.message_user(
request, "%s successfully marked as disabled." % message_bit)
self.message_user(request, "%s successfully marked as disabled." % message_bit)

make_status_enable.short_description = "Status Enable"
make_status_disable.short_description = "Status Disable"
list_display = ('name', 'description', 'status',
'auth_required', 'self_hosted')
list_display = ('name', 'description', 'status', 'auth_required', 'self_hosted')

actions = [make_status_enable, make_status_disable]
add_form = ServicesAdminForm
Expand Down Expand Up @@ -109,16 +108,17 @@ class TriggerServiceAdmin(admin.ModelAdmin):
"""
get the list of the User Service
"""
list_display = ('user', 'provider', 'consumer', 'description',
'date_created', 'date_triggered', 'status')
list_display = ('user', 'provider', 'consumer', 'description', 'date_created', 'date_triggered', 'status')
list_filter = [
('user', admin.RelatedOnlyFieldListFilter),
ProviderServiceListFilter,
ComsumerServiceListFilter,
'status'
('user', admin.RelatedOnlyFieldListFilter), ProviderServiceListFilter, ComsumerServiceListFilter, 'status'
]


UserAdmin.list_display = ('email', 'first_name', 'last_name', 'date_joined', 'last_login', 'is_active', 'is_staff')

admin.site.unregister(User)
admin.site.register(User, UserAdmin)

admin.site.register(ServicesActivated, ServicesManagedAdmin)
admin.site.register(UserService, UserServiceAdmin)
admin.site.register(TriggerService, TriggerServiceAdmin)

0 comments on commit 93eb4cd

Please sign in to comment.