From 42f7013a93bc62f6f7a6b17bc03713a5291c9b43 Mon Sep 17 00:00:00 2001
From: Felipe Henrique de Almeida Bormann <fbormann@Felipes-MacBook-Air.local>
Date: Fri, 13 Jan 2017 14:37:21 -0300
Subject: [PATCH] fixed show all subjects

---
 subjects/forms.py                      | 15 ++++++++++++++-
 subjects/models.py                     |  7 +++++++
 subjects/templates/subjects/_form.html |  2 +-
 subjects/templates/subjects/list.html  |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/subjects/forms.py b/subjects/forms.py
index fb11cdf..8006553 100644
--- a/subjects/forms.py
+++ b/subjects/forms.py
@@ -1,6 +1,6 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
-
+import datetime
 from .models import Subject, Tag
 
 class CreateSubjectForm(forms.ModelForm):
@@ -58,6 +58,19 @@ class CreateSubjectForm(forms.ModelForm):
 
         return self.instance
 
+    def clean(self):
+        cleaned_data = super(CreateSubjectForm, self).clean()
+        print("este")
+        if cleaned_data['subscribe_begin'] > cleaned_data['end_date']:
+            raise forms.ValidationError(_('Subscribe period should be  between course time'))
+        return cleaned_data
+    def clean_subscribe_begin(self):
+        subscribe_begin = self.cleaned_data['subscribe_begin']
+        #if subscribe_begin < datetime.datetime.today().date():
+            #self._errors['subscribe_begin'] = _('this date must be today or after')
+            #raise forms.ValidationError(_(''))
+        return subscribe_begin
+
 class CreateTagForm(forms.ModelForm):
     class Meta:
         model = Tag
diff --git a/subjects/models.py b/subjects/models.py
index 9f5fcd9..15f1cad 100644
--- a/subjects/models.py
+++ b/subjects/models.py
@@ -6,6 +6,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from users.models import User
 
+from django.core.exceptions import ValidationError
+
 from categories.models import Category
 import datetime
 class Tag(models.Model):
@@ -47,6 +49,11 @@ class Subject(models.Model):
     def __str__(self):
         return self.name
     
+    def clean(self):
+
+        if  self.subscribe_begin > self.end_date:
+            raise ValidationError(_('Subscribe period should be  between course time'))
 
+        
 
 
diff --git a/subjects/templates/subjects/_form.html b/subjects/templates/subjects/_form.html
index 3d83445..073d599 100644
--- a/subjects/templates/subjects/_form.html
+++ b/subjects/templates/subjects/_form.html
@@ -59,7 +59,7 @@
 					</div>
 				{% elif field.auto_id == 'id_description' or field.auto_id == 'id_description_brief' %}
 					{% render_field field class='form-control text_wysiwyg' %}
-				{% elif field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date' %}
+				{% elif field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date' or field.auto_id == 'id_subscribe_begin' or field.auto_id == 'id_subscribe_end' %}
 					{% render_field field class='form-control date-picker' %}
 				{% else %}
 					{% render_field field class='form-control' %}
diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
index 52f0645..fa6a06b 100644
--- a/subjects/templates/subjects/list.html
+++ b/subjects/templates/subjects/list.html
@@ -99,7 +99,7 @@
                             
                             <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
                                 {% for subject in category.subject_category.all %}
-                                    {% if request.user in subject.students.all or request.user.is_staff or request.user in subject.professor.all  %}
+                                    {% if request.user in subject.students.all or request.user.is_staff or request.user in subject.professor.all or all %}
                                         
                                         {% include "subjects/subject_card.html" %}
                                     {% endif %}
--
libgit2 0.21.2