external-repos/ivatar
1
0
Fork 0
mirror of https://git.linux-kernel.at/oliver/ivatar.git synced 2025-11-18 14:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into 'master'

Browse Source 
Merge with master

See merge request oliver/ivatar!89
This commit is contained in:
Oliver Falk
2018-12-03 19:16:10 +01:00
parent ea6829d118 fc001e141b
commit 53ff6ad9af
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ivatar/ivataraccount/migrations/0008_userpreference.py
View File

@@ -1,3 +1,4 @@
# pylint: disable=invalid-name,missing-docstring
# Generated by Django 2.0.6 on 2018-07-04 12:32 # Generated by Django 2.0.6 on 2018-07-04 12:32
from django.conf import settings from django.conf import settings
@@ -5,18 +6,18 @@ from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
def add_preference_to_user(apps, schema_editor): def add_preference_to_user(apps, schema_editor): # pylint: disable=unused-argument
''' '''
Make sure all users have preferences set up Make sure all users have preferences set up
''' '''
from django.contrib.auth.models import User from django.contrib.auth.models import User
UserPreference = apps.get_model('ivataraccount', 'UserPreference') UserPreference = apps.get_model('ivataraccount', 'UserPreference') # pylint: disable=invalid-name
for u in User.objects.filter(userpreference=None): for user in User.objects.filter(userpreference=None):
p = UserPreference.objects.create(user_id=u.pk) pref = UserPreference.objects.create(user_id=user.pk) # pragma: no cover
p.save() pref.save() # pragma: no cover
class Migration(migrations.Migration): class Migration(migrations.Migration): # pylint: disable=missing-docstring
dependencies = [ dependencies = [
('auth', '0009_alter_user_last_name_max_length'), ('auth', '0009_alter_user_last_name_max_length'),
@@ -27,8 +28,16 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='UserPreference', name='UserPreference',
fields=[ fields=[
('theme', models.CharField(choices=[('default', 'Default theme'), ('clime', 'Climes theme')], default='default', max_length=10)), ('theme', models.CharField(
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)), choices=[
('default', 'Default theme'),
('clime', 'Climes theme')],
default='default', max_length=10)),
('user', models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
primary_key=True,
serialize=False,
to=settings.AUTH_USER_MODEL)),
], ],
), ),
migrations.RunPython(add_preference_to_user), migrations.RunPython(add_preference_to_user),