Changing log to save deleted user info

Zambom
1 parent 2e5cee0a
Showing 7 changed files with 31 additions and 22 deletions Show diff stats
amadeus/templates/pagination.html
log/admin.py
log/decorators.py
log/migrations/0001_initial.py
log/mixins.py
log/models.py
subjects/views.py
-<div class="row-fluid">
-	<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12 text-center">
-	  	<ul class="pagination">
-	    	{% for page_number in paginator.page_range %}
-	    		<li{% if page_obj.number == page_number %} class="active"{% endif %}>
-	        		<a href="?page={{ page_number }}{{ getvars }}">{{ page_number }}</a>
-	    		</li>
-	    	{% endfor %}
-	  	</ul>
+{% if page.paginator.count > 0 %}
+	<div class="row-fluid">
+		<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12 text-center">
+		  	<ul class="pagination">
+		    	{% for page_number in paginator.page_range %}
+		    		<li{% if page_obj.number == page_number %} class="active"{% endif %}>
+		        		<a href="?page={{ page_number }}{{ getvars }}">{{ page_number }}</a>
+		    		</li>
+		    	{% endfor %}
+		  	</ul>
+		</div>
 	</div>
-</div>
 \ No newline at end of file
+{% endif %}
 \ No newline at end of file
@@ -3,7 +3,7 @@ from django.contrib import admin
 from .models import Log
 class LogAdmin(admin.ModelAdmin):
-	list_display = ['datetime', 'user', 'action', 'resource', 'context']
+	list_display = ['datetime', 'user', 'user_email', 'action', 'resource', 'context']
 	search_fields = ['user', 'action', 'resource']
 admin.site.register(Log, LogAdmin)
 \ No newline at end of file
@@ -16,7 +16,9 @@ def log_decorator(log_component = &#39;&#39;, log_action = &#39;&#39;, log_resource = &#39;&#39;):
 			if request.user.is_authenticated:
 				log = Log()
-				log.user = request.user
+				log.user = str(request.user)
+				log.user_id = request.user.id
+				log.user_email = request.user.email
 				log.component = log_component
 				log.context = request.log_context
 				log.action = log_action
@@ -41,7 +43,9 @@ def log_decorator_ajax(log_component = &#39;&#39;, log_action = &#39;&#39;, log_resource = &#39;&#39;):
 				if request.user.is_authenticated:
 					log = Log()
-					log.user = request.user
+					log.user = str(request.user)
+					log.user_id = request.user.id
+					log.user_email = request.user.email
 					log.component = log_component
 					log.context = ""
 					log.action = log_action
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-12-29 20:07
+# Generated by Django 1.10 on 2017-01-04 21:26
 from __future__ import unicode_literals
-from django.conf import settings
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
-import django.db.models.deletion
 class Migration(migrations.Migration):
@@ -13,7 +11,6 @@ class Migration(migrations.Migration):
     initial = True
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
     operations = [
@@ -25,12 +22,14 @@ class Migration(migrations.Migration):
                 ('context', django.contrib.postgres.fields.jsonb.JSONField(blank=True, verbose_name='Context')),
                 ('action', models.TextField(verbose_name='Action')),
                 ('resource', models.TextField(verbose_name='Resource')),
+                ('user', models.CharField(max_length=100, verbose_name='Actor')),
+                ('user_id', models.IntegerField(verbose_name='Actor id')),
+                ('user_email', models.EmailField(max_length=254, verbose_name='Actor Mail')),
                 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')),
             ],
             options={
-                'verbose_name_plural': 'Logs',
                 'verbose_name': 'Log',
+                'verbose_name_plural': 'Logs',
             },
         ),
     ]
@@ -12,7 +12,9 @@ class LogMixin(object):
 	def createLog(self, actor = None, component = '', log_action = '', log_resource = '', context = {}):
 		log = Log()
-		log.user = actor
+		log.user = str(actor)
+		log.user_id = actor.id
+		log.user_email = actor.email
 		log.context = context
 		log.component = component
 		log.action = log_action
@@ -9,7 +9,9 @@ class Log(models.Model):
 	context = JSONField(_('Context'), blank = True)
 	action = models.TextField(_('Action'))
 	resource = models.TextField(_('Resource'))
-	user = models.ForeignKey(User, verbose_name = _('Actor'))
+	user = models.CharField(_('Actor'), max_length = 100)
+	user_id = models.IntegerField(_('Actor id'))
+	user_email = models.EmailField(_('Actor Mail'))
 	datetime = models.DateTimeField(_("Date and Time of action"), auto_now_add = True)
 	class Meta:
@@ -46,7 +46,7 @@ class HomeView(LoginRequiredMixin, ListView):
     def get_context_data(self, **kwargs):
         context = super(HomeView, self).get_context_data(**kwargs)
-           
+        context['title'] = _('Home')
         # paginator = Paginator(subjects, 2)
         # page = self.request.GET.get('page')
	@@ -3,7 +3,7 @@ from django.contrib import admin		@@ -3,7 +3,7 @@ from django.contrib import admin
3	from .models import Log	3	from .models import Log
4		4
5	class LogAdmin(admin.ModelAdmin):	5	class LogAdmin(admin.ModelAdmin):
6	- list_display = ['datetime', 'user', 'action', 'resource', 'context']	6	+ list_display = ['datetime', 'user', 'user_email', 'action', 'resource', 'context']
7	search_fields = ['user', 'action', 'resource']	7	search_fields = ['user', 'action', 'resource']
8		8
9	admin.site.register(Log, LogAdmin)	9	admin.site.register(Log, LogAdmin)
10	\ No newline at end of file	10	\ No newline at end of file
	@@ -46,7 +46,7 @@ class HomeView(LoginRequiredMixin, ListView):		@@ -46,7 +46,7 @@ class HomeView(LoginRequiredMixin, ListView):
46		46
47	def get_context_data(self, **kwargs):	47	def get_context_data(self, **kwargs):
48	context = super(HomeView, self).get_context_data(**kwargs)	48	context = super(HomeView, self).get_context_data(**kwargs)
49	-	49	+ context['title'] = _('Home')
50	# paginator = Paginator(subjects, 2)	50	# paginator = Paginator(subjects, 2)
51		51
52	# page = self.request.GET.get('page')	52	# page = self.request.GET.get('page')