Skip to content

Commit

Permalink
Merge tracker migration
Browse files Browse the repository at this point in the history
  • Loading branch information
nsurbay committed Nov 22, 2017
1 parent 809f0ea commit ebc69ae
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 59 deletions.
18 changes: 16 additions & 2 deletions tracker/migrations/0010_auto_20171026_1010.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from __future__ import unicode_literals

import django.core.validators
from django.conf import settings
from django.db import migrations, models


Expand All @@ -16,11 +17,24 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='settings',
name='edit_policy',
field=models.IntegerField(choices=[(0, 'No timeout'), (1, 'Timeout'), (2, 'As long no next comment')], default=0, verbose_name='Policy for "Modify his comment" permission'),
field=models.IntegerField(choices=[(0, 'No timeout'), (1, 'Timeout'), (2, 'As long no next comment')], default=0, verbose_name='Policy for "Modify his issue and comment" permission'),
),
migrations.AddField(
model_name='settings',
name='edit_policy_timeout',
field=models.IntegerField(default=30, validators=[django.core.validators.MinValueValidator(1)], verbose_name='Timeout for "Modify his comment" permission (in min)'),
field=models.IntegerField(default=30, validators=[django.core.validators.MinValueValidator(1)], verbose_name='Timeout for "Modify his issue and comment" permission (in min)'),
),
migrations.CreateModel(
name='ReadState',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('lastread', models.DateTimeField(auto_now_add=True)),
('issue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='readstates', to='tracker.Issue')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='readstates', to=settings.AUTH_USER_MODEL)),
],
),
migrations.AlterUniqueTogether(
name='readstate',
unique_together=set([('issue', 'user')]),
),
]
31 changes: 0 additions & 31 deletions tracker/migrations/0011_auto_20171031_1530.py

This file was deleted.

26 changes: 0 additions & 26 deletions tracker/migrations/0012_auto_20171115_0933.py

This file was deleted.

0 comments on commit ebc69ae

Please sign in to comment.