Gogs 7 роки тому
батько
коміт
ce29fb1775

+ 1 - 1
core/admin.py

@@ -2,6 +2,6 @@
 from __future__ import unicode_literals
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
-from .models import User
+from core.models.user import User
 
 admin.site.register(User, UserAdmin)

+ 5 - 1
core/migrations/0001_initial.py

@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2018-03-02 11:51
+# Generated by Django 1.11 on 2018-03-02 14:06
 from __future__ import unicode_literals
 
+from django.conf import settings
 import django.contrib.auth.models
 import django.contrib.auth.validators
 from django.db import migrations, models
+import django.db.models.deletion
 import django.utils.timezone
 
 
@@ -51,6 +53,7 @@ class Migration(migrations.Migration):
                 ('create_at', models.DateTimeField(auto_now_add=True)),
                 ('update_at', models.DateTimeField(auto_now=True)),
                 ('status', models.PositiveSmallIntegerField(choices=[(1, 'Abierto'), (2, 'Rechazado'), (3, 'Procesando'), (4, 'Hecho'), (5, 'Error')], default=1)),
+                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'abstract': False,
@@ -65,6 +68,7 @@ class Migration(migrations.Migration):
                 ('update_at', models.DateTimeField(auto_now=True)),
                 ('playbook_name', models.CharField(max_length=35)),
                 ('last_execution', models.DateTimeField()),
+                ('request', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.Request')),
             ],
             options={
                 'abstract': False,

+ 0 - 1
core/models/base.py

@@ -11,4 +11,3 @@ class Base(models.Model):
 
     class Meta:
         abstract = True
-

+ 4 - 2
core/models/request.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 from django.db import models
-from .base import Base
+from core.models.base import Base
+from core.models.user import User
 
 REQUEST_STATUSES = (
     (1, 'Abierto'),
@@ -14,4 +15,5 @@ REQUEST_STATUSES = (
 '''
 '''
 class Request(Base):
-    status = models.PositiveSmallIntegerField(choices=REQUEST_STATUSES, default=1)
+    status = models.PositiveSmallIntegerField(choices=REQUEST_STATUSES, default=1)
+    user = models.ForeignKey(User, on_delete=models.CASCADE, null=True)

+ 4 - 2
core/models/task.py

@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from .base import Base
 from django.db import models
+from core.models.base import Base
+from core.models.request import Request
 
 '''
 '''
 class Task(Base):
     playbook_name = models.CharField(max_length=35)
-    last_execution = models.DateTimeField()
+    last_execution = models.DateTimeField()
+    request = models.ForeignKey(Request, on_delete=models.CASCADE, null=True)