diff --git a/.gitignore b/.gitignore index 0cc78b3..36538b7 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ dss/celery_settings.py dss/devsettings.py dss.conf dss/debugsettings.py +logs/ mysql test.py mysql2pgsql.yml @@ -34,4 +35,4 @@ reload reset __krud/ celerybeat-schedule -private/ \ No newline at end of file +private/ diff --git a/Dockerfile b/Dockerfile index 1fc4fea..fd64e60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,13 +3,10 @@ FROM fergalmoran/django ADD . /code/ -RUN mkdir /files/ RUN mkdir /files/static RUN mkdir /files/media -RUN mkdir /files/cache RUN mkdir /files/cache/mixes RUN mkdir /files/cache/waveforms -RUN mkdir /files/tmp RUN touch /files/tmp/dss.log WORKDIR /code diff --git a/spa/migrations/0026_notification_notification_text.py b/spa/migrations/0026_notification_notification_text.py new file mode 100644 index 0000000..efdb6d8 --- /dev/null +++ b/spa/migrations/0026_notification_notification_text.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('spa', '0025_socialaccountlink_provider_data'), + ] + + operations = [ + migrations.AddField( + model_name='notification', + name='notification_text', + field=models.CharField(null=True, max_length=2048), + ), + ] diff --git a/spa/migrations/0027_auto_20160607_2042.py b/spa/migrations/0027_auto_20160607_2042.py new file mode 100644 index 0000000..6f27ab5 --- /dev/null +++ b/spa/migrations/0027_auto_20160607_2042.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('spa', '0026_notification_notification_text'), + ] + + operations = [ + migrations.AlterField( + model_name='notification', + name='notification_text', + field=models.CharField(max_length=2048), + ), + ] diff --git a/spa/models/notification.py b/spa/models/notification.py index 7ea116f..29aeaff 100755 --- a/spa/models/notification.py +++ b/spa/models/notification.py @@ -17,6 +17,7 @@ class Notification(BaseModel): type = models.CharField(max_length=200, null=True) target = models.CharField(max_length=200, null=True) target_desc = models.CharField(max_length=200, null=True) + notification_text = models.CharField(max_length=2048, null=False) accepted_date = models.DateTimeField(null=True)