mirror of
https://github.com/retspen/webvirtcloud
synced 2025-07-31 12:41:08 +00:00
Fixed #7
This commit is contained in:
parent
5b336b2126
commit
1d22771519
6 changed files with 70 additions and 39 deletions
24
logs/migrations/0003_auto_20150518_1855.py
Normal file
24
logs/migrations/0003_auto_20150518_1855.py
Normal file
|
@ -0,0 +1,24 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models, migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('logs', '0002_auto_20150316_1420'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='logs',
|
||||
name='instance',
|
||||
field=models.CharField(max_length=50),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='logs',
|
||||
name='user',
|
||||
field=models.CharField(max_length=50),
|
||||
),
|
||||
]
|
|
@ -1,12 +1,11 @@
|
|||
from django.db import models
|
||||
from instances.models import Instance
|
||||
from django.contrib.auth.models import User
|
||||
|
||||
|
||||
class Logs(models.Model):
|
||||
user = models.ForeignKey(User)
|
||||
instance = models.ForeignKey(Instance)
|
||||
user = models.CharField(max_length=50)
|
||||
instance = models.CharField(max_length=50)
|
||||
message = models.CharField(max_length=255)
|
||||
date = models.DateTimeField(auto_now=True)
|
||||
|
||||
def __unicode__(self):
|
||||
return self.instance
|
||||
return self.instance
|
||||
|
|
|
@ -37,10 +37,10 @@
|
|||
{% for log in logs %}
|
||||
<tr>
|
||||
<td>{{ forloop.counter }}</td>
|
||||
<td><a href="{% url 'account' log.user.id %}">{{ log.user }}</a></td>
|
||||
<td><a href="{% url 'instance' log.instance.compute.id log.instance %}">{{ log.instance }}</a></td>
|
||||
<td>{{ log.user }}</a></td>
|
||||
<td>{{ log.instance }}</a></td>
|
||||
<td>{{ log.message }}</td>
|
||||
<td style="width:120px;">{{ log.date|date:"M d H:i:s" }}</td>
|
||||
<td style="width:130px;">{{ log.date|date:"M d H:i:s" }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
|
|
@ -4,12 +4,12 @@ from django.core.urlresolvers import reverse
|
|||
from logs.models import Logs
|
||||
|
||||
|
||||
def addlogmsg(userid, instanceid, message):
|
||||
def addlogmsg(user, instance, message):
|
||||
"""
|
||||
:param request:
|
||||
:return:
|
||||
"""
|
||||
add_log_msg = Logs(user_id=userid, instance_id=instanceid, message=message)
|
||||
add_log_msg = Logs(user=user, instance=instance, message=message)
|
||||
add_log_msg.save()
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue