smile/cbmi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
cmile 2018-10-04 08:42:58 +02:00
parent 3160f5e696
commit 3dcd65d7de
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
account/migrations/0001_initial.py
View file

@ -1,12 +1,14 @@
# -*- coding: utf-8 -*- # Generated by Django 2.1.2 on 2018-10-02 21:00
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
initial = True
dependencies = [ dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL), migrations.swappable_dependency(settings.AUTH_USER_MODEL),
] ]
@ -15,14 +17,14 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='UserProfile', name='UserProfile',
fields=[ fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('uid', models.CharField(default=None, max_length=8, null=True, verbose_name=b'User-ID')), ('uid', models.CharField(default=None, max_length=8, null=True, verbose_name='User-ID')),
('sippin', models.CharField(default=None, max_length=255, null=True, verbose_name=b'SIP PIN', blank=True)), ('sippin', models.CharField(blank=True, default=None, max_length=255, null=True, verbose_name='SIP PIN')),
('gastropin', models.CharField(default=None, max_length=255, null=True, verbose_name=b'Gastro PIN', blank=True)), ('gastropin', models.CharField(blank=True, default=None, max_length=255, null=True, verbose_name='Gastro PIN')),
('rfid', models.CharField(default=None, max_length=255, null=True, verbose_name=b'RFID', blank=True)), ('rfid', models.CharField(blank=True, default=None, max_length=255, null=True, verbose_name='RFID')),
('macaddress', models.CharField(default=None, max_length=255, null=True, verbose_name=b'MAC-Address', blank=True)), ('macaddress', models.CharField(blank=True, default=None, max_length=255, null=True, verbose_name='MAC-Address')),
('clabpin', models.CharField(default=None, max_length=255, null=True, verbose_name=b'c-lab PIN', blank=True)), ('clabpin', models.CharField(blank=True, default=None, max_length=255, null=True, verbose_name='c-lab PIN')),
('preferred_email', models.CharField(default=None, max_length=1024, null=True, verbose_name=b'preferred e-mail address')), ('preferred_email', models.CharField(default=None, max_length=1024, null=True, verbose_name='preferred e-mail address')),
('is_member', models.BooleanField(default=False, editable=False)), ('is_member', models.BooleanField(default=False, editable=False)),
('is_ldap_admin', models.BooleanField(default=False, editable=False)), ('is_ldap_admin', models.BooleanField(default=False, editable=False)),
('is_circle_member', models.BooleanField(default=False, editable=False)), ('is_circle_member', models.BooleanField(default=False, editable=False)),
@ -30,7 +32,7 @@ class Migration(migrations.Migration):
('is_cey_member', models.BooleanField(default=False, editable=False)), ('is_cey_member', models.BooleanField(default=False, editable=False)),
('is_ceymaster', models.BooleanField(default=False, editable=False)), ('is_ceymaster', models.BooleanField(default=False, editable=False)),
('is_soundlab_member', models.BooleanField(default=False, editable=False)), ('is_soundlab_member', models.BooleanField(default=False, editable=False)),
('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL)), ('user', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
], ],
), ),
] ]

1
account/views.py
View file

@ -136,7 +136,6 @@ def set_hash_field(request, form_type, in_field, out_field, hash_func,
form = form_type(request.POST) form = form_type(request.POST)
if form.is_valid(): if form.is_valid():
hashed_value = hash_func(form.cleaned_data[in_field]) hashed_value = hash_func(form.cleaned_data[in_field])
print('hashed value: ', hashed_value)
member.set(out_field, hashed_value) member.set(out_field, hashed_value)
member.save() member.save()
new_form = form_type(initial=initial) new_form = form_type(initial=initial)