Merge lp:~frigory/inkscape-web/projects into lp:inkscape-web

[Bryce Harrington]

Migration for improving projects model design.

[Martin Owens (doctormo)]

Looking good.

review: Approve (code)

=== modified file 'projects/admin.py'
--- projects/admin.py	2016-01-21 05:43:13 +0000
+++ projects/admin.py	2016-12-12 05:31:01 +0000
@@ -32,7 +32,7 @@
     model = Deliverable
 
 class UpdateInline(StackedInline):
-    model = ProjectUpdate
+    model = Report
     extra = 1
     readonly_fields = ('creator',)
 

=== added file 'projects/migrations/0004_auto_20161211_0746.py'
--- projects/migrations/0004_auto_20161211_0746.py	1970-01-01 00:00:00 +0000
+++ projects/migrations/0004_auto_20161211_0746.py	2016-12-12 05:31:01 +0000
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import cms.utils.permissions
+import pile.fields
+from django.conf import settings
+import django.core.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('projects', '0003_auto_20160312_1649'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='criteria',
+            old_name='detail',
+            new_name='description',
+        ),
+        migrations.RenameField(
+            model_name='criteria',
+            old_name='content',
+            new_name='name',
+        ),
+        migrations.RenameField(
+            model_name='project',
+            old_name='desc',
+            new_name='description',
+        ),
+        migrations.RenameField(
+            model_name='project',
+            old_name='sort',
+            new_name='difficulty',
+        ),
+        migrations.RenameField(
+            model_name='task',
+            old_name='delive',
+            new_name='deliverable',
+        ),
+        migrations.RenameModel(
+            old_name='ProjectUpdate',
+            new_name='Report',
+        ),
+        migrations.RenameField(
+            model_name='report',
+            old_name='describe',
+            new_name='description',
+        ),
+        migrations.AlterField(
+            model_name='relatedfile',
+            name='for_update',
+            field=models.ForeignKey(related_name='related_files', to='projects.Report'),
+        ),
+    ]

=== modified file 'projects/models.py'
--- projects/models.py	2016-10-06 01:32:16 +0000
+++ projects/models.py	2016-12-12 05:31:01 +0000
@@ -61,11 +61,11 @@
     LOGO   = os.path.join(settings.STATIC_URL, 'images', 'project_logo.png')
     BANNER = os.path.join(settings.STATIC_URL, 'images', 'project_banner.png')
 
-    sort   = IntegerField(_('Difficulty'), choices=DIFFICULTIES, default=2)
-    title  = CharField(_('Title'), max_length=100)
-    pitch  = CharField(_('Short Summary'), max_length=255, **null)
-    slug   = SlugField(unique=True)
-    desc   = TextField(_('Description'), validators=[MaxLengthValidator(50192)], **null)
+    difficulty  = IntegerField(_('Difficulty'), choices=DIFFICULTIES, default=2)
+    title       = CharField(_('Title'), max_length=100)
+    pitch       = CharField(_('Short Summary'), max_length=255, **null)
+    slug        = SlugField(unique=True)
+    description = TextField(_('Description'), validators=[MaxLengthValidator(50192)], **null)
 
     banner   = ResizedImageField(_("Banner (920x120)"), max_height=120, max_width=920,
                                                         min_height=90, min_width=600,
@@ -182,8 +182,8 @@
 
 class Task(Model):
     """A task or sub-task of a deliverable stage"""
-    delive = ForeignKey(Deliverable, related_name='tasks')
-    name   = CharField(_('Task'), max_length=255)
+    deliverable = ForeignKey(Deliverable, related_name='tasks')
+    name        = CharField(_('Task'), max_length=255)
 
     targeted = DateField(**null)
     finished = DateField(**null)
@@ -196,32 +196,32 @@
 
 
 class Criteria(Model):
-    content  = CharField(_('Criteria'), max_length=255)
-    detail   = TextField(validators=[MaxLengthValidator(4096)], **null)
+    name        = CharField(_('Criteria'), max_length=255)
+    description = TextField(validators=[MaxLengthValidator(4096)], **null)
 
     def __str__(self):
-        return self.content
-
-
-class ProjectUpdate(Model):
+        return self.name
+
+
+class Report(Model):
     """A project should always have at least one update with its primary description"""
 
-    project  = ForeignKey(Project, related_name='updates')
-    describe = TextField(_("Description"), validators=[MaxLengthValidator(12288)])
-    image    = ResizedImageField(_("Image"), max_height=400, max_width=400,
+    project     = ForeignKey(Project, related_name='updates')
+    description = TextField(_("Description"), validators=[MaxLengthValidator(12288)])
+    image       = ResizedImageField(_("Image"), max_height=400, max_width=400,
                      upload_to=os.path.join('project', 'update', '%Y'), **null)
 
-    creator  = ForeignKey(settings.AUTH_USER_MODEL, default=get_user)
-    created  = DateTimeField(auto_now_add=True, db_index=True)
-    edited   = DateTimeField(auto_now=True)
+    creator     = ForeignKey(settings.AUTH_USER_MODEL, default=get_user)
+    created     = DateTimeField(auto_now_add=True, db_index=True)
+    edited      = DateTimeField(auto_now=True)
 
     def __str__(self):
-        return self.describe
+        return self.description
 
 class RelatedFile(Model):
     """Allows to add files to Project Update reports"""
 
-    for_update = ForeignKey(ProjectUpdate, related_name='related_files')
+    for_update = ForeignKey(Report, related_name='related_files')
     updatefile = FileField(_("Related File"), upload_to=os.path.join('project', 'related_files'))
 
     def __str__(self):