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

Merge branch 'gwalborn-master' into test

Browse Source 
Conflicts:
	mayan/apps/metadata/forms.py
This commit is contained in:
Roberto Rosario
2014-10-07 13:47:02 -04:00
parent a85b3b1526 6896b29b89
commit 78ecee7266
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mayan/apps/metadata/forms.py
View File

@@ -1,27 +1,40 @@
from __future__ import absolute_import
from django import forms
from django.forms.formsets import formset_factory
from django.forms.formsets import formset_factory, BaseFormSet
from django.utils.translation import ugettext_lazy as _
from common.widgets import ScrollableCheckboxSelectMultiple
from .models import DocumentTypeDefaults, MetadataSet, MetadataType
from .settings import AVAILABLE_FUNCTIONS, AVAILABLE_MODELS
from .settings import AVAILABLE_FUNCTIONS, AVAILABLE_MODELS, AVAILABLE_VALIDATORS
class MetadataForm(forms.Form):
def clean_value(self):
value = self.cleaned_data['value']
metadata_id = self.cleaned_data['id']
metadata_type = MetadataType.objects.get(pk=metadata_id)
if ( metadata_type.lookup
and AVAILABLE_VALIDATORS.has_key(metadata_type.lookup) ):
val_func=AVAILABLE_VALIDATORS[metadata_type.lookup]
new_value = val_func(value)
if new_value:
value = new_value
return value
def __init__(self, *args, **kwargs):
super(MetadataForm, self).__init__(*args, **kwargs)
# Set form fields initial values
if 'initial' in kwargs:
self.metadata_type = kwargs['initial'].pop('metadata_type', None)
# FIXME:
# required = self.document_type.documenttypemetadatatype_set.get(metadata_type=self.metadata_type).required
required = False
required_string = u''
if required:
self.fields['value'].required = True
required_string = ' (%s)' % _(u'Required')
@@ -31,8 +44,10 @@ class MetadataForm(forms.Form):
self.fields['name'].initial = '%s%s' % ((self.metadata_type.title if self.metadata_type.title else self.metadata_type.name), required_string)
self.fields['id'].initial = self.metadata_type.pk
if self.metadata_type.lookup:
if ( self.metadata_type.lookup
and not AVAILABLE_VALIDATORS.has_key(self.metadata_type.lookup)):
try:
choices = eval(self.metadata_type.lookup, AVAILABLE_MODELS)
self.fields['value'] = forms.ChoiceField(label=self.fields['value'].label)
@@ -51,12 +66,16 @@ class MetadataForm(forms.Form):
except Exception as exception:
self.fields['value'].initial = exception
id = forms.CharField(label=_(u'id'), widget=forms.HiddenInput)
name = forms.CharField(label=_(u'Name'),
required=False, widget=forms.TextInput(attrs={'readonly': 'readonly'}))
value = forms.CharField(label=_(u'Value'), required=False)
update = forms.BooleanField(initial=True, label=_(u'Update'), required=False)
MetadataFormSet = formset_factory(MetadataForm, extra=0)

4
mayan/apps/metadata/settings.py
View File

@@ -16,6 +16,9 @@ default_available_models = {
'User': User
}
default_available_validators = {
}
register_settings(
namespace=u'metadata',
module=u'metadata.settings',
@@ -23,5 +26,6 @@ register_settings(
# Definition
{'name': u'AVAILABLE_FUNCTIONS', 'global_name': u'METADATA_AVAILABLE_FUNCTIONS', 'default': default_available_functions},
{'name': u'AVAILABLE_MODELS', 'global_name': u'METADATA_AVAILABLE_MODELS', 'default': default_available_models},
{'name': u'AVAILABLE_VALIDATORS', 'global_name': u'METADATA_AVAILABLE_VALIDATORS', 'default': default_available_validators},
]
)