Rename folder model 'title' field to 'label'.

This commit is contained in:
Roberto Rosario
2015-07-07 23:34:27 -04:00
parent 4860b44daf
commit 4e4103803f
7 changed files with 58 additions and 11 deletions

View File

@@ -18,7 +18,7 @@ logger = logging.getLogger(__name__)
class FolderForm(forms.ModelForm):
class Meta:
model = Folder
fields = ('title',)
fields = ('label',)
class FolderListForm(forms.Form):

View File

@@ -0,0 +1,27 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('folders', '0001_initial'),
]
operations = [
migrations.AlterModelOptions(
name='folder',
options={'ordering': ('label',), 'verbose_name': 'Folder', 'verbose_name_plural': 'Folders'},
),
migrations.RenameField(
model_name='folder',
old_name='title',
new_name='label',
),
migrations.AlterUniqueTogether(
name='folder',
unique_together=set([('label', 'user')]),
),
]

View File

@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('folders', '0002_auto_20150708_0333'),
]
operations = [
migrations.AlterField(
model_name='folder',
name='label',
field=models.CharField(max_length=128, verbose_name='Label', db_index=True),
preserve_default=True,
),
]

View File

@@ -11,19 +11,19 @@ from documents.models import Document
@python_2_unicode_compatible
class Folder(models.Model):
title = models.CharField(max_length=128, verbose_name=_('Title'), db_index=True)
label = models.CharField(max_length=128, verbose_name=_('Label'), db_index=True)
user = models.ForeignKey(User, verbose_name=_('User'))
datetime_created = models.DateTimeField(verbose_name=_('Datetime created'), auto_now_add=True)
documents = models.ManyToManyField(Document, related_name='folders', verbose_name=_('Documents'))
def __str__(self):
return self.title
return self.label
def get_absolute_url(self):
return reverse('folders:folder_view', args=[self.pk])
class Meta:
unique_together = ('title', 'user')
ordering = ('title',)
unique_together = ('label', 'user')
ordering = ('label',)
verbose_name = _('Folder')
verbose_name_plural = _('Folders')

View File

@@ -9,7 +9,7 @@ class FolderSerializer(serializers.ModelSerializer):
documents = serializers.SerializerMethodField('get_documents_count')
class Meta:
fields = ('id', 'title', 'user', 'datetime_created', 'documents')
fields = ('id', 'label', 'user', 'datetime_created', 'documents')
model = Folder
read_only_fields = ('user',)

View File

@@ -28,7 +28,7 @@ class FolderTestCase(TestCase):
self.user = User.objects.create_superuser(username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, password=TEST_ADMIN_PASSWORD)
def test_creation_of_folder(self):
folder = Folder.objects.create(title='test', user=self.user)
folder = Folder.objects.create(label='test', user=self.user)
self.assertEqual(Folder.objects.all().count(), 1)
self.assertEqual(list(Folder.objects.all()), [folder])
@@ -36,7 +36,7 @@ class FolderTestCase(TestCase):
def test_addition_of_documents(self):
user = User.objects.all()[0]
folder = Folder.objects.create(title='test', user=self.user)
folder = Folder.objects.create(label='test', user=self.user)
folder.documents.add(self.document)
self.assertEqual(folder.documents.count(), 1)
@@ -45,7 +45,7 @@ class FolderTestCase(TestCase):
def test_addition_and_deletion_of_documents(self):
user = User.objects.all()[0]
folder = Folder.objects.create(title='test', user=self.user)
folder = Folder.objects.create(label='test', user=self.user)
folder.documents.add(self.document)
self.assertEqual(folder.documents.count(), 1)

View File

@@ -67,12 +67,12 @@ def folder_create(request):
if request.method == 'POST':
form = FolderForm(request.POST)
if form.is_valid():
folder, created = Folder.objects.get_or_create(user=request.user, title=form.cleaned_data['title'])
folder, created = Folder.objects.get_or_create(user=request.user, label=form.cleaned_data['label'])
if created:
messages.success(request, _('Folder created successfully'))
return HttpResponseRedirect(reverse('folders:folder_list'))
else:
messages.error(request, _('A folder named: %s, already exists.') % form.cleaned_data['title'])
messages.error(request, _('A folder named: %s, already exists.') % form.cleaned_data['label'])
else:
form = FolderForm()