diff --git a/mayan/apps/metadata/admin.py b/mayan/apps/metadata/admin.py index 4e85946372..f3c835afd5 100644 --- a/mayan/apps/metadata/admin.py +++ b/mayan/apps/metadata/admin.py @@ -6,7 +6,7 @@ from .models import MetadataType class MetadataTypeAdmin(admin.ModelAdmin): - list_display = ('name', 'title', 'default', 'lookup', 'validation') + list_display = ('name', 'label', 'default', 'lookup', 'validation') admin.site.register(MetadataType, MetadataTypeAdmin) diff --git a/mayan/apps/metadata/forms.py b/mayan/apps/metadata/forms.py index 411eb96bba..c86e465e11 100644 --- a/mayan/apps/metadata/forms.py +++ b/mayan/apps/metadata/forms.py @@ -63,7 +63,7 @@ class MetadataForm(forms.Form): else: self.fields['value'].required = False - self.fields['name'].initial = '%s%s' % ((self.metadata_type.title if self.metadata_type.title else self.metadata_type.name), required_string) + self.fields['name'].initial = '%s%s' % ((self.metadata_type.label if self.metadata_type.label else self.metadata_type.name), required_string) self.fields['id'].initial = self.metadata_type.pk if self.metadata_type.lookup: @@ -116,5 +116,5 @@ MetadataRemoveFormSet = formset_factory(MetadataRemoveForm, extra=0) class MetadataTypeForm(forms.ModelForm): class Meta: - fields = ('name', 'title', 'default', 'lookup', 'validation') + fields = ('name', 'label', 'default', 'lookup', 'validation') model = MetadataType diff --git a/mayan/apps/metadata/migrations/0003_auto_20150708_0323.py b/mayan/apps/metadata/migrations/0003_auto_20150708_0323.py new file mode 100644 index 0000000000..97140dff76 --- /dev/null +++ b/mayan/apps/metadata/migrations/0003_auto_20150708_0323.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('metadata', '0002_auto_20150708_0118'), + ] + + operations = [ + migrations.AlterModelOptions( + name='metadatatype', + options={'ordering': ('label',), 'verbose_name': 'Metadata type', 'verbose_name_plural': 'Metadata types'}, + ), + migrations.RenameField( + model_name='metadatatype', + old_name='title', + new_name='label', + ), + ] diff --git a/mayan/apps/metadata/migrations/0004_auto_20150708_0324.py b/mayan/apps/metadata/migrations/0004_auto_20150708_0324.py new file mode 100644 index 0000000000..a514272195 --- /dev/null +++ b/mayan/apps/metadata/migrations/0004_auto_20150708_0324.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('metadata', '0003_auto_20150708_0323'), + ] + + operations = [ + migrations.AlterField( + model_name='metadatatype', + name='label', + field=models.CharField(max_length=48, verbose_name='Label'), + preserve_default=True, + ), + ] diff --git a/mayan/apps/metadata/models.py b/mayan/apps/metadata/models.py index cc82a7b940..0ceba77f54 100644 --- a/mayan/apps/metadata/models.py +++ b/mayan/apps/metadata/models.py @@ -21,8 +21,7 @@ class MetadataType(models.Model): Define a type of metadata """ name = models.CharField(unique=True, max_length=48, verbose_name=_('Name'), help_text=_('Do not use python reserved words, or spaces.')) - # TODO: normalize 'title' to 'label' - title = models.CharField(max_length=48, verbose_name=_('Title')) + label = models.CharField(max_length=48, verbose_name=_('Label')) default = models.CharField(max_length=128, blank=True, null=True, verbose_name=_('Default'), help_text=_('Enter a string to be evaluated.')) @@ -37,13 +36,13 @@ class MetadataType(models.Model): objects = MetadataTypeManager() def __str__(self): - return self.title + return self.label def natural_key(self): return (self.name,) class Meta: - ordering = ('title',) + ordering = ('label',) verbose_name = _('Metadata type') verbose_name_plural = _('Metadata types')