Merge branch 'gwalborn-master' into test

Conflicts:
	mayan/apps/metadata/forms.py
This commit is contained in:
Roberto Rosario
2014-10-07 13:47:02 -04:00
2 changed files with 27 additions and 4 deletions

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},
]
)