matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Initial commit to remove use of eval. gh-issue #151.

Browse Source
This commit is contained in:
Roberto Rosario
2015-07-22 23:19:43 -04:00
parent 4527563d89
commit 58d919d173
10 changed files with 606 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
mayan/apps/metadata/models.py
View File

@@ -12,7 +12,10 @@ from .settings import setting_available_validators
def validation_choices():
return zip(setting_available_validators.value, setting_available_validators.value)
return zip(
setting_available_validators.value,
setting_available_validators.value
)
@python_2_unicode_compatible
@@ -20,13 +23,28 @@ class MetadataType(models.Model):
"""
Define a type of metadata
"""
name = models.CharField(max_length=48, help_text=_('Do not use python reserved words, or spaces.'), unique=True, verbose_name=_('Name'))
name = models.CharField(
max_length=48,
help_text=_('Name used by other apps to reference this value. Do not use python reserved words, or spaces.'),
unique=True, verbose_name=_('Name')
)
label = models.CharField(max_length=48, verbose_name=_('Label'))
default = models.CharField(blank=True, max_length=128, null=True, help_text=_('Enter a string to be evaluated.'), verbose_name=_('Default'))
default = models.CharField(
blank=True, max_length=128, null=True,
help_text=_('Enter a template to render. Use Django\'s default templating language (https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)'),
verbose_name=_('Default')
)
# TODO: Add enable_lookup boolean to allow users to switch the lookup on and
# off without losing the lookup expression
lookup = models.TextField(blank=True, null=True, help_text=_('Enter a string to be evaluated that returns an iterable.'), verbose_name=_('Lookup'))
validation = models.CharField(blank=True, choices=validation_choices(), max_length=64, verbose_name=_('Validation function name'))
lookup = models.TextField(
blank=True, null=True,
help_text=_('Enter a string to be evaluated that returns an iterable.'),
verbose_name=_('Lookup')
)
validation = models.CharField(
blank=True, choices=validation_choices(), max_length=64,
verbose_name=_('Validation function name')
)
# TODO: Find a different way to let users know what models and functions are
# available now that we removed these from the help_text
objects = MetadataTypeManager()
@@ -49,22 +67,31 @@ class DocumentMetadata(models.Model):
Link a document to a specific instance of a metadata type with it's
current value
"""
document = models.ForeignKey(Document, related_name='metadata', verbose_name=_('Document'))
document = models.ForeignKey(
Document, related_name='metadata', verbose_name=_('Document')
)
metadata_type = models.ForeignKey(MetadataType, verbose_name=_('Type'))
value = models.CharField(blank=True, db_index=True, max_length=255, null=True, verbose_name=_('Value'))
value = models.CharField(
blank=True, db_index=True, max_length=255, null=True,
verbose_name=_('Value')
)
def __str__(self):
return unicode(self.metadata_type)
def save(self, *args, **kwargs):
if self.metadata_type.pk not in self.document.document_type.metadata.values_list('metadata_type', flat=True):
raise ValidationError(_('Metadata type is not valid for this document type.'))
raise ValidationError(
_('Metadata type is not valid for this document type.')
)
return super(DocumentMetadata, self).save(*args, **kwargs)
def delete(self, enforce_required=True, *args, **kwargs):
if enforce_required and self.metadata_type.pk in self.document.document_type.metadata.filter(required=True).values_list('metadata_type', flat=True):
raise ValidationError(_('Metadata type is required for this document type.'))
raise ValidationError(
_('Metadata type is required for this document type.')
)
return super(DocumentMetadata, self).delete(*args, **kwargs)
@@ -76,8 +103,13 @@ class DocumentMetadata(models.Model):
@python_2_unicode_compatible
class DocumentTypeMetadataType(models.Model):
document_type = models.ForeignKey(DocumentType, related_name='metadata', verbose_name=_('Document type'))
metadata_type = models.ForeignKey(MetadataType, verbose_name=_('Metadata type'))
document_type = models.ForeignKey(
DocumentType, related_name='metadata',
verbose_name=_('Document type')
)
metadata_type = models.ForeignKey(
MetadataType, verbose_name=_('Metadata type')
)
required = models.BooleanField(default=False, verbose_name=_('Required'))
def __str__(self):