diff options
author | maxbr <maxbr@mi.fu-berlin.de> | 2016-08-22 18:59:47 +0200 |
---|---|---|
committer | maxbr <maxbr@mi.fu-berlin.de> | 2016-08-22 19:04:19 +0200 |
commit | 6c993d9e3bd9a7c0fb94d7056e664648dd8d85cb (patch) | |
tree | 8ae572cb4454cd9de3aca27b88d08dadf76cbdf3 /tools/pharos-dashboard/account | |
parent | 7528d995257181b91c0d82dd82a2aa0f832ef63f (diff) |
Create Jira issue for new booking
JIRA: RELENG-12
The issue is assigned to the lab owner and to the POD Access Request
Component. The pgp and ssh keys are uploaded to jira as an attachement.
Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
Diffstat (limited to 'tools/pharos-dashboard/account')
-rw-r--r-- | tools/pharos-dashboard/account/forms.py | 2 | ||||
-rw-r--r-- | tools/pharos-dashboard/account/models.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/pharos-dashboard/account/forms.py b/tools/pharos-dashboard/account/forms.py index 14f11cda..92c55d85 100644 --- a/tools/pharos-dashboard/account/forms.py +++ b/tools/pharos-dashboard/account/forms.py @@ -9,6 +9,4 @@ class AccountSettingsForm(forms.ModelForm): model = UserProfile fields = ['company', 'ssh_public_key', 'pgp_public_key', 'timezone'] - ssh_public_key = forms.CharField(max_length=2048, widget=forms.Textarea) - pgp_public_key = forms.CharField(max_length=2048, widget=forms.Textarea) timezone = forms.ChoiceField(choices=[(x, x) for x in pytz.common_timezones], initial='UTC') 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) |