ynerant/med
1
0
Fork 0
mirror of https://gitlab.crans.org/mediatek/med.git synced 2025-06-29 23:11:09 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

Browse Source 
# Conflicts:
#	media/admin.py
#	users/admin.py
#	users/views.py
This commit is contained in:
Yohann D'ANELLO
2020-09-25 10:28:39 +02:00
parent 796c985ffb dc4cb56dd0
commit a06ae5c9b9
8 changed files with 113 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/admin.py
View File

@ -6,6 +6,7 @@ from django.urls import reverse
from django.utils.html import format_html
from django.utils.translation import ugettext_lazy as _
from reversion.admin import VersionAdmin
from med.admin import admin_site
from .forms import MediaAdminForm

55
media/migrations/0038_auto_20200923_2030.py Normal file
View File

@ -0,0 +1,55 @@
# Generated by Django 2.2.12 on 2020-09-23 18:30
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('media', '0037_revue_double'),
]
operations = [
migrations.AlterField(
model_name='bd',
name='external_url',
field=models.URLField(blank=True, default='', verbose_name='external URL'),
preserve_default=False,
),
migrations.AlterField(
model_name='bd',
name='subtitle',
field=models.CharField(blank=True, default='', max_length=255, verbose_name='subtitle'),
preserve_default=False,
),
migrations.AlterField(
model_name='jeu',
name='comment',
field=models.CharField(blank=True, default='', max_length=255, verbose_name='comment'),
preserve_default=False,
),
migrations.AlterField(
model_name='manga',
name='external_url',
field=models.URLField(blank=True, default='', verbose_name='external URL'),
preserve_default=False,
),
migrations.AlterField(
model_name='manga',
name='subtitle',
field=models.CharField(blank=True, default='', max_length=255, verbose_name='subtitle'),
preserve_default=False,
),
migrations.AlterField(
model_name='roman',
name='external_url',
field=models.URLField(blank=True, default='', verbose_name='external URL'),
preserve_default=False,
),
migrations.AlterField(
model_name='roman',
name='subtitle',
field=models.CharField(blank=True, default='', max_length=255, verbose_name='subtitle'),
preserve_default=False,
),
]

7
media/models.py
View File

@ -48,13 +48,11 @@ class BD(models.Model):
verbose_name=_('subtitle'),
max_length=255,
blank=True,
null=True,
)
external_url = models.URLField(
verbose_name=_('external URL'),
blank=True,
null=True,
)
side_identifier = models.CharField(
@ -109,13 +107,11 @@ class Manga(models.Model):
verbose_name=_('subtitle'),
max_length=255,
blank=True,
null=True,
)
external_url = models.URLField(
verbose_name=_('external URL'),
blank=True,
null=True,
)
side_identifier = models.CharField(
@ -167,13 +163,11 @@ class Roman(models.Model):
verbose_name=_('subtitle'),
max_length=255,
blank=True,
null=True,
)
external_url = models.URLField(
verbose_name=_('external URL'),
blank=True,
null=True,
)
side_identifier = models.CharField(
@ -415,7 +409,6 @@ class Jeu(models.Model):
comment = models.CharField(
max_length=255,
blank=True,
null=True,
verbose_name=_('comment'),
)