diff --git a/.gitignore b/.gitignore index f786b7780e7..7de28cd85e4 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ devconfig.json *.sublime-project *.sublime-workspace intranet/apps/files/cred.py* +uploads/* diff --git a/config/provision_vagrant.sh b/config/provision_vagrant.sh index 64f24f6bf3a..1114d7165b2 100644 --- a/config/provision_vagrant.sh +++ b/config/provision_vagrant.sh @@ -92,6 +92,7 @@ sudo -i -u vagrant bash -c " " source .virtualenvs/ion/bin/activate cd intranet +mkdir -p uploads ./manage.py migrate --noinput cd .. chown -R vagrant: /home/vagrant diff --git a/intranet/apps/printing/migrations/0004_auto_20151218_1346.py b/intranet/apps/printing/migrations/0004_auto_20151218_1346.py new file mode 100644 index 00000000000..2dad789ddfe --- /dev/null +++ b/intranet/apps/printing/migrations/0004_auto_20151218_1346.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('printing', '0003_printjob_num_pages'), + ] + + operations = [ + migrations.AlterField( + model_name='printjob', + name='file', + field=models.FileField(upload_to='uploads/'), + ), + ] diff --git a/intranet/apps/printing/models.py b/intranet/apps/printing/models.py index a3d0e308e47..3114d15eafa 100644 --- a/intranet/apps/printing/models.py +++ b/intranet/apps/printing/models.py @@ -7,7 +7,7 @@ class PrintJob(models.Model): user = models.ForeignKey(User, null=True, blank=True) printer = models.CharField(max_length=100) - file = models.FileField() + file = models.FileField(upload_to="uploads/") time = models.DateTimeField(auto_now_add=True) printed = models.BooleanField(default=False) num_pages = models.IntegerField(default=0)