petr/www.tagesschule-elementa.ch
2
1
Fork 0
forked from TagesschuleElementa/www.tagesschule-elementa.ch
Code Issues Pull Requests Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Simon Caminada
2018-03-22 22:36:51 +01:00
parent a5aa4e5b9c
commit 0c0fcec7d0
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/portal/migrations/0001_initial.py
View File

@@ -1,12 +1,11 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-03-22 16:10
# Generated by Django 1.11.11 on 2018-03-22 16:36
from __future__ import unicode_literals
import cms.models.fields
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
import image_cropping.fields
import parler.models
import project.utils
@@ -19,8 +18,8 @@ class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.FILER_IMAGE_MODEL),
('cms', '0018_pagenode'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('auth', '0008_alter_user_username_max_length'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
@@ -32,9 +31,9 @@ class Migration(migrations.Migration):
('groups', models.ManyToManyField(related_name='files', to='auth.Group', verbose_name='Mitgliedergruppen')),
],
options={
'ordering': ['ordering'],
'verbose_name_plural': 'Download Files',
'verbose_name': 'Download File',
'ordering': ['ordering'],
},
bases=(parler.models.TranslatableModelMixin, models.Model),
),
@@ -49,11 +48,11 @@ class Migration(migrations.Migration):
('master', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='portal.DownloadFile')),
],
options={
'managed': True,
'db_tablespace': '',
'verbose_name': 'Download File Translation',
'default_permissions': (),
'db_tablespace': '',
'managed': True,
'db_table': 'portal_downloadfile_translation',
'verbose_name': 'Download File Translation',
},
),
migrations.CreateModel(
@@ -63,9 +62,9 @@ class Migration(migrations.Migration):
('ordering', models.IntegerField(default=50, verbose_name='Sortierung')),
],
options={
'ordering': ['ordering'],
'verbose_name_plural': 'Download Sections',
'verbose_name': 'Download Section',
'ordering': ['ordering'],
},
bases=(parler.models.TranslatableModelMixin, models.Model),
),
@@ -78,11 +77,11 @@ class Migration(migrations.Migration):
('master', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='portal.DownloadSection')),
],
options={
'managed': True,
'db_tablespace': '',
'verbose_name': 'Download Section Translation',
'default_permissions': (),
'db_tablespace': '',
'managed': True,
'db_table': 'portal_downloadsection_translation',
'verbose_name': 'Download Section Translation',
},
),
migrations.CreateModel(
@@ -105,11 +104,11 @@ class Migration(migrations.Migration):
('master', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='portal.DownloadTag')),
],
options={
'managed': True,
'db_tablespace': '',
'verbose_name': 'Download Tag Translation',
'default_permissions': (),
'db_tablespace': '',
'managed': True,
'db_table': 'portal_downloadtag_translation',
'verbose_name': 'Download Tag Translation',
},
),
migrations.CreateModel(
@@ -118,16 +117,16 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('cropping', image_cropping.fields.ImageRatioField('image', '1200x800', adapt_rotation=False, allow_fullsize=False, free_crop=True, help_text=None, hide_image_field=False, size_warning=False, verbose_name='cropping')),
('published', models.BooleanField(default=False, verbose_name='Veröffentlicht')),
('publish_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Veröffentlichungsdatum')),
('updated', models.DateTimeField(auto_now=True, verbose_name='Aktualisiert')),
('groups', models.ManyToManyField(related_name='tasks', to='auth.Group', verbose_name='Mitglieder Gruppe')),
('image', project.utils.CroppableFilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.FILER_IMAGE_MODEL, verbose_name='Bild')),
('informed_users', models.ManyToManyField(blank=True, null=True, to=settings.AUTH_USER_MODEL, verbose_name='Als gelesen markiert von:')),
('placeholder', cms.models.fields.PlaceholderField(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, slotname='content', to='cms.Placeholder')),
],
options={
'verbose_name_plural': 'Mitglieder Aufgaben',
'verbose_name': 'Mitglieder Aufgabe',
'ordering': ['-publish_date'],
'ordering': ['-updated'],
'verbose_name_plural': 'Informationen',
'verbose_name': 'Information',
},
bases=(parler.models.TranslatableModelMixin, models.Model),
),
@@ -140,11 +139,11 @@ class Migration(migrations.Migration):
('master', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='translations', to='portal.Information')),
],
options={
'managed': True,
'db_tablespace': '',
'verbose_name': 'Mitglieder Aufgabe Translation',
'default_permissions': (),
'db_tablespace': '',
'managed': True,
'db_table': 'portal_information_translation',
'verbose_name': 'Information Translation',
},
),
migrations.CreateModel(

3
src/portal/models.py
View File

@@ -45,6 +45,7 @@ class Information(TranslatableModel):
placeholder = PlaceholderField('content')
published = models.BooleanField(verbose_name='Veröffentlicht', default=False)
updated = models.DateTimeField(verbose_name='Aktualisiert', auto_now=True)
informed_users = models.ManyToManyField(get_user_model(), verbose_name='Als gelesen markiert von:',
null=True, blank=True)
@@ -55,7 +56,7 @@ class Information(TranslatableModel):
class Meta:
verbose_name = 'Information'
verbose_name_plural = 'Informationen'
ordering = ['-publish_date']
ordering = ['-updated']
def __str__(self):
return self.title