diff --git a/workflow/migrations/0034_dashboard_tola_user_uuid.py b/workflow/migrations/0034_dashboard_tola_user_uuid.py new file mode 100644 index 000000000..3966e272a --- /dev/null +++ b/workflow/migrations/0034_dashboard_tola_user_uuid.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.17 on 2019-02-27 05:11 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('workflow', '0033_auto_20190213_0302'), + ] + + operations = [ + migrations.AddField( + model_name='dashboard', + name='tola_user_uuid', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='TolaUser UUID'), + ), + ] diff --git a/workflow/migrations/0035_auto_20190226_2147.py b/workflow/migrations/0035_auto_20190226_2147.py new file mode 100644 index 000000000..486e9ac55 --- /dev/null +++ b/workflow/migrations/0035_auto_20190226_2147.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.17 on 2019-02-27 05:47 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('workflow', '0034_dashboard_tola_user_uuid'), + ] + + operations = [ + migrations.RenameField( + model_name='dashboard', + old_name='tola_user_uuid', + new_name='created_by', + ), + ] diff --git a/workflow/migrations/0036_merge_20190226_2343.py b/workflow/migrations/0036_merge_20190226_2343.py new file mode 100644 index 000000000..521c9375b --- /dev/null +++ b/workflow/migrations/0036_merge_20190226_2343.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.17 on 2019-02-27 07:43 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('workflow', '0035_auto_20190226_2147'), + ('workflow', '0034_office_organization'), + ] + + operations = [ + ] diff --git a/workflow/models.py b/workflow/models.py index a4a9cd931..aee00cf98 100755 --- a/workflow/models.py +++ b/workflow/models.py @@ -395,6 +395,8 @@ def save(self, *args, **kwargs): class Dashboard(models.Model): dashboard_uuid = models.UUIDField(editable=False, verbose_name='Dashboard UUID', default=uuid.uuid4, unique=True) user = models.ForeignKey(TolaUser, related_name='toladashboard') + # naming this with suffix _uuid interfears with public token generation + created_by = models.CharField(max_length=255, verbose_name='TolaUser UUID', null=True, blank=True) name = models.CharField(blank=True, null=True, max_length=255) widgets = models.ManyToManyField(Widget, blank=True) share = models.ManyToManyField(TolaUser, blank=True)