Skip to content
Snippets Groups Projects
Commit 8b275ba9 authored by Julian's avatar Julian
Browse files

Merge first_name and last_name of AbiPerson

parent 703abc62
No related branches found
No related tags found
1 merge request!1Resolve "Implement models"
# Generated by Django 3.2.4 on 2021-07-14 14:49 # Generated by Django 3.2.4 on 2021-07-26 11:11
import django.contrib.sites.managers import django.contrib.sites.managers
from django.db import migrations, models from django.db import migrations, models
...@@ -35,8 +35,7 @@ class Migration(migrations.Migration): ...@@ -35,8 +35,7 @@ class Migration(migrations.Migration):
fields=[ fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('extended_data', models.JSONField(default=dict, editable=False)), ('extended_data', models.JSONField(default=dict, editable=False)),
('first_name', models.CharField(max_length=255, verbose_name='First name')), ('name', models.CharField(max_length=255, verbose_name='Name')),
('last_name', models.CharField(max_length=255, verbose_name='Last name')),
('person', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='abi_persons', to='core.person', verbose_name='AlekSIS person')), ('person', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='abi_persons', to='core.person', verbose_name='AlekSIS person')),
('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')), ('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')),
], ],
......
...@@ -6,8 +6,7 @@ from aleksis.core.models import Person ...@@ -6,8 +6,7 @@ from aleksis.core.models import Person
class AbiPerson(ExtensibleModel): class AbiPerson(ExtensibleModel):
first_name = models.CharField(max_length=255, verbose_name=_("First name")) name = models.CharField(max_length=255, verbose_name=_("Name"))
last_name = models.CharField(max_length=255, verbose_name=_("Last name"))
person = models.ForeignKey( person = models.ForeignKey(
to=Person, to=Person,
on_delete=models.SET_NULL, on_delete=models.SET_NULL,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment