From 651defffe195b847f2d78e8e51c3b4a624154ec6 Mon Sep 17 00:00:00 2001
From: Felipe Henrique de Almeida Bormann <fbormann@Felipes-MacBook-Air.local>
Date: Wed, 1 Feb 2017 20:10:44 -0300
Subject: [PATCH] modifying links description brief, model and resource_card

---
 categories/migrations/0012_auto_20170201_2010.py       | 21 +++++++++++++++++++++
 links/forms.py                                         |  4 ++--
 links/migrations/0008_remove_link_description_brief.py | 19 +++++++++++++++++++
 links/models.py                                        |  4 ----
 links/templates/links/_form.html                       | 10 +++++-----
 pendencies/migrations/0005_auto_20170201_2010.py       | 20 ++++++++++++++++++++
 subjects/templates/subjects/resource_card.html         |  7 +++----
 7 files changed, 70 insertions(+), 15 deletions(-)
 create mode 100644 categories/migrations/0012_auto_20170201_2010.py
 create mode 100644 links/migrations/0008_remove_link_description_brief.py
 create mode 100644 pendencies/migrations/0005_auto_20170201_2010.py

diff --git a/categories/migrations/0012_auto_20170201_2010.py b/categories/migrations/0012_auto_20170201_2010.py
new file mode 100644
index 0000000..53e9e82
--- /dev/null
+++ b/categories/migrations/0012_auto_20170201_2010.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-02-01 23:10
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('categories', '0011_auto_20170201_1732'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='category',
+            name='coordinators',
+            field=models.ManyToManyField(blank=True, related_name='coordinators', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/links/forms.py b/links/forms.py
index 9011530..2349d25 100644
--- a/links/forms.py
+++ b/links/forms.py
@@ -29,14 +29,14 @@ class LinkForm(forms.ModelForm):
 	
 	class Meta:
 		model = Link
-		fields = ['name','link_url', 'description_brief', 'all_students', 'students', 'groups', 'visible']
+		fields = ['name','link_url', 'brief_description', 'all_students', 'students', 'groups', 'visible']
 		labels = {
 			'name': _('Link name'),
 			'end_view' : _('End View'),
 			'end_view_date': _('End View Date')
 		}
 		widgets = {
-			'description_brief': forms.Textarea,
+			'brief_description': forms.Textarea,
 			'students': forms.SelectMultiple,
 			'groups': forms.SelectMultiple,
 		}
diff --git a/links/migrations/0008_remove_link_description_brief.py b/links/migrations/0008_remove_link_description_brief.py
new file mode 100644
index 0000000..1dd2bd8
--- /dev/null
+++ b/links/migrations/0008_remove_link_description_brief.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-02-01 23:10
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('links', '0007_auto_20170201_1907'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='link',
+            name='description_brief',
+        ),
+    ]
diff --git a/links/models.py b/links/models.py
index 38704f5..f277f53 100644
--- a/links/models.py
+++ b/links/models.py
@@ -8,10 +8,6 @@ from users.models import User
 from django.utils import timezone
 # Create your models here.
 class Link(Resource):
-   
-
-    description_brief = models.TextField(_("simpler_description"), blank=True)
-
     link_url = models.URLField(verbose_name = _("Link_URL"))
     
    
diff --git a/links/templates/links/_form.html b/links/templates/links/_form.html
index c770abc..6ee271d 100644
--- a/links/templates/links/_form.html
+++ b/links/templates/links/_form.html
@@ -61,18 +61,18 @@
 
 
 	<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
-		<label for="{{ form.description_brief.auto_id }}">{{ form.description_brief.label }}</label>
-		{% render_field form.description_brief class='form-control text_wysiwyg' %}
+		<label for="{{ form.brief_description.auto_id }}">{{ form.brief_description.label }}</label>
+		{% render_field form.brief_description class='form-control text_wysiwyg' %}
 
-		<span id="helpBlock" class="help-block">{{ form.description_brief.help_text }}</span>
+		<span id="helpBlock" class="help-block">{{ form.brief_description.help_text }}</span>
 			
-		{% if form.description_brief.errors %}
+		{% if form.brief_description.errors %}
 			<div class="alert alert-danger alert-dismissible" role="alert">
 					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
 						<span aria-hidden="true">&times;</span>
 					</button>
 				<ul>
-					{% for error in form.description_brief.errors %}
+					{% for error in form.brief_description.errors %}
 						<li>{{ error }}</li>
 					{% endfor %}
 				</ul>
diff --git a/pendencies/migrations/0005_auto_20170201_2010.py b/pendencies/migrations/0005_auto_20170201_2010.py
new file mode 100644
index 0000000..ec583d6
--- /dev/null
+++ b/pendencies/migrations/0005_auto_20170201_2010.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-02-01 23:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pendencies', '0004_auto_20170124_0128'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pendencies',
+            name='action',
+            field=models.CharField(blank=True, choices=[('view', 'Visualize'), ('create', 'Create'), ('answer', 'Answer'), ('access', 'Access'), ('finish', 'Finish')], max_length=100, verbose_name='Action'),
+        ),
+    ]
diff --git a/subjects/templates/subjects/resource_card.html b/subjects/templates/subjects/resource_card.html
index fb3d64c..03fee37 100644
--- a/subjects/templates/subjects/resource_card.html
+++ b/subjects/templates/subjects/resource_card.html
@@ -51,10 +51,9 @@
                     <p><b>{% trans "Subject" %}:</b> {{resource.topic.subject.name}}</p>
                 </div>
             </div>
-            {% if resource.description %}
-                <p>{{resource.description|safe}}</p>
-            {% elif resource.description_brief %}
-            	<p>{{resource.description_brief|safe}}</p>
+            {% if resource.brief_description %}
+                <p>{{resource.brief_description|safe}}</p>
+           
             {% endif %}
             
              <a href="{% url resource.access_link resource.slug %}" class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a>
--
libgit2 0.21.2