rm old owner
This commit is contained in:
parent
f361932590
commit
a5cb99c0c3
3 changed files with 5 additions and 12 deletions
|
@ -61,8 +61,8 @@ class CharFieldModelAdmin(admin.ModelAdmin):
|
||||||
|
|
||||||
|
|
||||||
class EquipmentAdmin(admin.ModelAdmin):
|
class EquipmentAdmin(admin.ModelAdmin):
|
||||||
list_display = ['name', 'stock', 'owner', 'pole', 'category']
|
list_display = ['name', 'stock', 'pole', 'category']
|
||||||
ordering = ['name', 'owner', 'pole', 'category']
|
ordering = ['name', 'pole', 'category']
|
||||||
inlines = [EquipmentDefaultExtraInline,
|
inlines = [EquipmentDefaultExtraInline,
|
||||||
EquipmentLostExtraInline,
|
EquipmentLostExtraInline,
|
||||||
EquipmentRevisionExtraInline]
|
EquipmentRevisionExtraInline]
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# Generated by Django 1.11.11 on 2018-08-07 18:28
|
# Generated by Django 1.11.11 on 2018-08-07 18:43
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
from django.db import migrations, models
|
from django.db import migrations
|
||||||
import django.db.models.deletion
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
@ -13,10 +12,9 @@ class Migration(migrations.Migration):
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
migrations.AlterField(
|
migrations.RemoveField(
|
||||||
model_name='equipment',
|
model_name='equipment',
|
||||||
name='owner',
|
name='owner',
|
||||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='auth.Group'),
|
|
||||||
),
|
),
|
||||||
migrations.DeleteModel(
|
migrations.DeleteModel(
|
||||||
name='EquipmentOwner',
|
name='EquipmentOwner',
|
|
@ -50,11 +50,6 @@ class Equipment(EventSpecificMixin, models.Model):
|
||||||
related_name="equipment",
|
related_name="equipment",
|
||||||
through="EquipmentAttribution",
|
through="EquipmentAttribution",
|
||||||
)
|
)
|
||||||
owner = models.ForeignKey(
|
|
||||||
Group,
|
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
)
|
|
||||||
pole = models.ForeignKey(
|
pole = models.ForeignKey(
|
||||||
EquipmentPole,
|
EquipmentPole,
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue