Rename folder model 'title' field to 'label'.
This commit is contained in:
@@ -18,7 +18,7 @@ logger = logging.getLogger(__name__)
|
|||||||
class FolderForm(forms.ModelForm):
|
class FolderForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Folder
|
model = Folder
|
||||||
fields = ('title',)
|
fields = ('label',)
|
||||||
|
|
||||||
|
|
||||||
class FolderListForm(forms.Form):
|
class FolderListForm(forms.Form):
|
||||||
|
|||||||
@@ -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')]),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -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,
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -11,19 +11,19 @@ from documents.models import Document
|
|||||||
|
|
||||||
@python_2_unicode_compatible
|
@python_2_unicode_compatible
|
||||||
class Folder(models.Model):
|
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'))
|
user = models.ForeignKey(User, verbose_name=_('User'))
|
||||||
datetime_created = models.DateTimeField(verbose_name=_('Datetime created'), auto_now_add=True)
|
datetime_created = models.DateTimeField(verbose_name=_('Datetime created'), auto_now_add=True)
|
||||||
documents = models.ManyToManyField(Document, related_name='folders', verbose_name=_('Documents'))
|
documents = models.ManyToManyField(Document, related_name='folders', verbose_name=_('Documents'))
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.title
|
return self.label
|
||||||
|
|
||||||
def get_absolute_url(self):
|
def get_absolute_url(self):
|
||||||
return reverse('folders:folder_view', args=[self.pk])
|
return reverse('folders:folder_view', args=[self.pk])
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
unique_together = ('title', 'user')
|
unique_together = ('label', 'user')
|
||||||
ordering = ('title',)
|
ordering = ('label',)
|
||||||
verbose_name = _('Folder')
|
verbose_name = _('Folder')
|
||||||
verbose_name_plural = _('Folders')
|
verbose_name_plural = _('Folders')
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ class FolderSerializer(serializers.ModelSerializer):
|
|||||||
documents = serializers.SerializerMethodField('get_documents_count')
|
documents = serializers.SerializerMethodField('get_documents_count')
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
fields = ('id', 'title', 'user', 'datetime_created', 'documents')
|
fields = ('id', 'label', 'user', 'datetime_created', 'documents')
|
||||||
model = Folder
|
model = Folder
|
||||||
read_only_fields = ('user',)
|
read_only_fields = ('user',)
|
||||||
|
|
||||||
|
|||||||
@@ -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)
|
self.user = User.objects.create_superuser(username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, password=TEST_ADMIN_PASSWORD)
|
||||||
|
|
||||||
def test_creation_of_folder(self):
|
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(Folder.objects.all().count(), 1)
|
||||||
self.assertEqual(list(Folder.objects.all()), [folder])
|
self.assertEqual(list(Folder.objects.all()), [folder])
|
||||||
@@ -36,7 +36,7 @@ class FolderTestCase(TestCase):
|
|||||||
|
|
||||||
def test_addition_of_documents(self):
|
def test_addition_of_documents(self):
|
||||||
user = User.objects.all()[0]
|
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)
|
folder.documents.add(self.document)
|
||||||
|
|
||||||
self.assertEqual(folder.documents.count(), 1)
|
self.assertEqual(folder.documents.count(), 1)
|
||||||
@@ -45,7 +45,7 @@ class FolderTestCase(TestCase):
|
|||||||
|
|
||||||
def test_addition_and_deletion_of_documents(self):
|
def test_addition_and_deletion_of_documents(self):
|
||||||
user = User.objects.all()[0]
|
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)
|
folder.documents.add(self.document)
|
||||||
|
|
||||||
self.assertEqual(folder.documents.count(), 1)
|
self.assertEqual(folder.documents.count(), 1)
|
||||||
|
|||||||
@@ -67,12 +67,12 @@ def folder_create(request):
|
|||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
form = FolderForm(request.POST)
|
form = FolderForm(request.POST)
|
||||||
if form.is_valid():
|
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:
|
if created:
|
||||||
messages.success(request, _('Folder created successfully'))
|
messages.success(request, _('Folder created successfully'))
|
||||||
return HttpResponseRedirect(reverse('folders:folder_list'))
|
return HttpResponseRedirect(reverse('folders:folder_list'))
|
||||||
else:
|
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:
|
else:
|
||||||
form = FolderForm()
|
form = FolderForm()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user