From 57bf6db346c54c2b1fb1686cdd8efed57930d696 Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Wed, 7 Sep 2016 10:51:20 -0300
Subject: [PATCH] Adding 'Action', 'Resource' and 'Action_Resource' to admin

---
 core/admin.py  | 18 +++++++++++++++++-
 core/models.py | 13 +++++--------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/core/admin.py b/core/admin.py
index ea5d68b..9c93f47 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -1,3 +1,19 @@
 from django.contrib import admin
 
-# Register your models here.
+from .models import Action, Resource, Action_Resource
+
+class ActionAdmin(admin.ModelAdmin):
+	list_display = ['name', 'created_date']
+	search_fields = ['name', 'created_date']
+
+class ResourceAdmin(admin.ModelAdmin):
+	list_display = ['name', 'created_date']
+	search_fields = ['name', 'created_date']
+
+class ActionResourceAdmin(admin.ModelAdmin):
+	list_display = ['action', 'resource']
+	search_fields = ['action', 'resource']
+
+admin.site.register(Action, ActionAdmin)
+admin.site.register(Resource, ResourceAdmin)
+admin.site.register(Action_Resource, ActionResourceAdmin)
\ No newline at end of file
diff --git a/core/models.py b/core/models.py
index d33c64c..12b655d 100644
--- a/core/models.py
+++ b/core/models.py
@@ -13,15 +13,15 @@ class Action(models.Model):
     created_date = models.DateField(_('Created Date'), auto_now_add=True)
     
 
-    def __init__(self, name):
-    	self.name = name
+    #def __init__(self, name):
+    #	self.name = name
 
     class Meta:
         verbose_name = "Action"
         verbose_name_plural = "Actions"
 
     def __str__(self):
-        pass
+        return self.name
     
 
 class Resource(models.Model):
@@ -38,7 +38,7 @@ class Resource(models.Model):
         verbose_name_plural = "Resources"    
 
     def __str__(self):
-        pass	
+        return self.name
 
 
 class Action_Resource(models.Model):
@@ -49,9 +49,6 @@ class Action_Resource(models.Model):
     class Meta:
         verbose_name = "Action_Resource"
         verbose_name_plural = "Action_Resources"
-
-    def __str__(self):
-        pass
     
 
 class Notification(models.Model):
@@ -66,7 +63,7 @@ class Notification(models.Model):
         verbose_name_plural = _("Notifications")
 
     def __str__(self):
-        pass
+        return self.message
 
 class Log(models.Model):
     datetime = models.DateTimeField(_("Date and Time of action"), auto_now_add = True)
--
libgit2 0.21.2