parent
5aad2aadff
commit
79001600b9
|
@ -5,11 +5,11 @@ from django.db import models
|
|||
from ietf.utils.pipe import pipe
|
||||
|
||||
|
||||
class EncriptedException(Exception):
|
||||
class EncryptedException(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class EncriptedTextField(models.TextField):
|
||||
class EncryptedTextField(models.TextField):
|
||||
def pre_save(self, instance, add):
|
||||
if add:
|
||||
comments = getattr(instance, 'comments')
|
||||
|
@ -26,6 +26,6 @@ class EncriptedTextField(models.TextField):
|
|||
instance.comments = out
|
||||
return out
|
||||
else:
|
||||
raise EncriptedException(error)
|
||||
raise EncryptedException(error)
|
||||
else:
|
||||
return instance.comments
|
||||
|
|
|
@ -78,7 +78,7 @@ class Migration(SchemaMigration):
|
|||
('author', self.gf('django.db.models.fields.EmailField')(max_length=75)),
|
||||
('position', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['nomcom.Position'])),
|
||||
('nominee', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['nomcom.Nominee'])),
|
||||
('comments', self.gf('ietf.nomcom.fields.EncriptedTextField')()),
|
||||
('comments', self.gf('ietf.nomcom.fields.EncryptedTextField')()),
|
||||
('type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.FeedbackType'])),
|
||||
('time', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
|
||||
))
|
||||
|
@ -328,7 +328,7 @@ class Migration(SchemaMigration):
|
|||
'nomcom.feedback': {
|
||||
'Meta': {'object_name': 'Feedback'},
|
||||
'author': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
|
||||
'comments': ('ietf.nomcom.fields.EncriptedTextField', [], {}),
|
||||
'comments': ('ietf.nomcom.fields.EncryptedTextField', [], {}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'nominee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['nomcom.Nominee']"}),
|
||||
'position': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['nomcom.Position']"}),
|
||||
|
|
|
@ -6,7 +6,7 @@ from django.core.files.storage import FileSystemStorage
|
|||
|
||||
from south.modelsinspector import add_introspection_rules
|
||||
|
||||
from ietf.nomcom.fields import EncriptedTextField
|
||||
from ietf.nomcom.fields import EncryptedTextField
|
||||
from ietf.person.models import Email
|
||||
from ietf.group.models import Group
|
||||
from ietf.name.models import NomineePositionState, FeedbackType
|
||||
|
@ -130,7 +130,7 @@ class Feedback(models.Model):
|
|||
author = models.EmailField(verbose_name='Author', blank=True)
|
||||
position = models.ForeignKey('Position')
|
||||
nominee = models.ForeignKey('Nominee')
|
||||
comments = EncriptedTextField(verbose_name='Comments')
|
||||
comments = EncryptedTextField(verbose_name='Comments')
|
||||
type = models.ForeignKey(FeedbackType)
|
||||
time = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
|
@ -139,4 +139,4 @@ class Feedback(models.Model):
|
|||
|
||||
# ----- adding south rules to help introspection -----
|
||||
|
||||
add_introspection_rules([], ["^ietf\.nomcom\.fields\.EncriptedTextField"])
|
||||
add_introspection_rules([], ["^ietf\.nomcom\.fields\.EncryptedTextField"])
|
||||
|
|
Loading…
Reference in a new issue