Merge changes from topic 'pharos-dashboard'

* changes:
  Create Jira issue for new booking
  Remove database migration files

1 files changed, 4 insertions, 2 deletions

diff --git a/tools/pharos-dashboard/account/models.py b/tools/pharos-dashboard/account/models.py
index fbabf6c4..fb2c8ddd 100644
--- a/tools/pharos-dashboard/account/models.py
+++ b/tools/pharos-dashboard/account/models.py
@@ -4,12 +4,14 @@ from django.contrib.auth.models import User
 
 from dashboard.models import Resource
 
+def upload_to(object, filename):
+    return object.user.username + '/' + filename
 
 class UserProfile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
     timezone = models.CharField(max_length=100, blank=False, default='UTC')
-    ssh_public_key = models.CharField(max_length=2048, blank=False)
-    pgp_public_key = models.CharField(max_length=2048, blank=False)
+    ssh_public_key = models.FileField(upload_to=upload_to, null=True, blank=True)
+    pgp_public_key = models.FileField(upload_to=upload_to, null=True, blank=True)
     company = models.CharField(max_length=200, blank=False)
     oauth_token = models.CharField(max_length=1024, blank=False)
     oauth_secret = models.CharField(max_length=1024, blank=False)