fixed coordinators empty option and display on template

Felipe Henrique de Almeida Bormann
1 parent a2deb60c
Showing 5 changed files with 56 additions and 4 deletions Show diff stats
categories/migrations/0004_auto_20170102_1224.py
categories/migrations/0005_auto_20170102_1225.py
categories/models.py
categories/templates/categories/list.html
subjects/templates/subjects/list.html
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-02 15:24
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('categories', '0003_auto_20161226_1358'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='category',
+            name='coordinators',
+            field=models.ManyToManyField(null=True, related_name='coordinators', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-02 15:25
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('categories', '0004_auto_20170102_1224'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='category',
+            name='coordinators',
+            field=models.ManyToManyField(blank=True, related_name='coordinators', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
@@ -10,7 +10,7 @@ class Category(models.Model):
 	slug = AutoSlugField(_("Slug"),populate_from='name',unique=True)
 	description = models.CharField(_("description"), max_length = 300)
 	visible = models.BooleanField(_("visible"))
-	coordinators = models.ManyToManyField(User, related_name = _("coordinators"))
+	coordinators = models.ManyToManyField(User, related_name = _("coordinators"), blank=True)
 	create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
 	modified_date = models.DateTimeField(_('Modified Date'), auto_now_add = True)
@@ -81,11 +81,16 @@
                         <input type="hidden" class="log_url" value="{% url 'categories:view_log' category.id %}" />
                         <input type="hidden" class="log_id" value="" />
-                        <h4>  {% trans "Coordinator(s): " %}
+                        {% if coordinators %}
+                             <h4>  {% trans "Coordinator(s): " %}
                             {% for coordinator in category.coordinators.all %}
                                 {{coordinator.social_name}}
                             {% endfor %}
                         </h4>
+                        {% else %}
+                            <h4> {% trans "It doesn't possess coordinators" %} </h4>
+                        {% endif %}
+
                         {{category.description|safe}}
                     </div>
@@ -73,12 +73,17 @@
                     <div id="{{category.slug}}" class="panel-collapse collapse category-panel-content">
                         <input type="hidden" class="log_url" value="{% url 'categories:view_log' category.id %}" />
                         <input type="hidden" class="log_id" value="" />
-
-                        <h4>  {% trans "Coordinator(s): " %}
+                        {% if coordinators %}
+                             <h4>  {% trans "Coordinator(s): " %}
                             {% for coordinator in category.coordinators.all %}
                                 {{coordinator.social_name}}
                             {% endfor %}
                         </h4>
+                        {% else %}
+                            <h4> {% trans "It doesn't possess coordinators" %} </h4>
+                        {% endif %}
+
+                       
                         {{category.description|safe}}
                         {% if user in category.coordinators.all %}
                         <button class="create-subject-btn"> {% trans "create new subject" %} </button>
@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2017-01-02 15:24
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.conf import settings
	6	+from django.db import migrations, models
	7	+
	8	+
	9	+class Migration(migrations.Migration):
	10	+
	11	+ dependencies = [
	12	+ ('categories', '0003_auto_20161226_1358'),
	13	+ ]
	14	+
	15	+ operations = [
	16	+ migrations.AlterField(
	17	+ model_name='category',
	18	+ name='coordinators',
	19	+ field=models.ManyToManyField(null=True, related_name='coordinators', to=settings.AUTH_USER_MODEL),
	20	+ ),
	21	+ ]
	@@ -10,7 +10,7 @@ class Category(models.Model):		@@ -10,7 +10,7 @@ class Category(models.Model):
10	slug = AutoSlugField(_("Slug"),populate_from='name',unique=True)	10	slug = AutoSlugField(_("Slug"),populate_from='name',unique=True)
11	description = models.CharField(_("description"), max_length = 300)	11	description = models.CharField(_("description"), max_length = 300)
12	visible = models.BooleanField(_("visible"))	12	visible = models.BooleanField(_("visible"))
13	- coordinators = models.ManyToManyField(User, related_name = _("coordinators"))	13	+ coordinators = models.ManyToManyField(User, related_name = _("coordinators"), blank=True)
14	create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)	14	create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
15	modified_date = models.DateTimeField(_('Modified Date'), auto_now_add = True)	15	modified_date = models.DateTimeField(_('Modified Date'), auto_now_add = True)
16		16