From c482962182c18a6472f82a8883fd281ce65be414 Mon Sep 17 00:00:00 2001 From: Zambom Date: Wed, 7 Sep 2016 11:08:42 -0300 Subject: [PATCH] Adding model Log to admin --- core/admin.py | 9 +++++++-- core/models.py | 7 +++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/admin.py b/core/admin.py index 9c93f47..4881288 100644 --- a/core/admin.py +++ b/core/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from .models import Action, Resource, Action_Resource +from .models import Action, Resource, Action_Resource, Log class ActionAdmin(admin.ModelAdmin): list_display = ['name', 'created_date'] @@ -14,6 +14,11 @@ class ActionResourceAdmin(admin.ModelAdmin): list_display = ['action', 'resource'] search_fields = ['action', 'resource'] +class LogAdmin(admin.ModelAdmin): + list_display = ['datetime', 'user', 'action_resource'] + search_fields = ['user'] + admin.site.register(Action, ActionAdmin) admin.site.register(Resource, ResourceAdmin) -admin.site.register(Action_Resource, ActionResourceAdmin) \ No newline at end of file +admin.site.register(Action_Resource, ActionResourceAdmin) +admin.site.register(Log, LogAdmin) \ No newline at end of file diff --git a/core/models.py b/core/models.py index 12b655d..cda594f 100644 --- a/core/models.py +++ b/core/models.py @@ -12,10 +12,6 @@ class Action(models.Model): name = models.CharField(_('Name'), max_length = 100) created_date = models.DateField(_('Created Date'), auto_now_add=True) - - #def __init__(self, name): - # self.name = name - class Meta: verbose_name = "Action" verbose_name_plural = "Actions" @@ -49,6 +45,9 @@ class Action_Resource(models.Model): class Meta: verbose_name = "Action_Resource" verbose_name_plural = "Action_Resources" + + def __str__(self): + return ''.join([self.action.name, " / ", self.resource.name]) class Notification(models.Model): -- libgit2 0.21.2