From 25ed30ee10cbfa18e896109466699af7c3061f52 Mon Sep 17 00:00:00 2001 From: Felipe Henrique de Almeida Bormann Date: Mon, 2 Jan 2017 22:38:41 -0300 Subject: [PATCH] upgraded django version and changed create view answer --- requirements.txt | 2 +- subjects/templates/subjects/create.html | 16 ++++++++++++++++ subjects/views.py | 8 +++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6454333..c9b205a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ coverage==4.2 decorator==4.0.10 deps==0.1.0 dj-database-url==0.4.1 -Django==1.10 +Django==1.10.4 django-autoslug==1.9.3 django-bootstrap-breadcrumbs==0.8 django-braces==1.10.0 diff --git a/subjects/templates/subjects/create.html b/subjects/templates/subjects/create.html index 76d3434..34a6ba3 100644 --- a/subjects/templates/subjects/create.html +++ b/subjects/templates/subjects/create.html @@ -89,6 +89,22 @@ this.qs2.cache(); } });// Used to create multi-select css style + + $('.collapse').on('show.bs.collapse', function (e) { + if($(this).is(e.target)){ + var btn = $(this).parent().find('.fa-angle-right'); + + btn.switchClass("fa-angle-right", "fa-angle-down", 250, "easeInOutQuad"); + } + }); + + $('.collapse').on('hide.bs.collapse', function (e) { + if($(this).is(e.target)){ + var btn = $(this).parent().find('.fa-angle-down'); + + btn.switchClass("fa-angle-down", "fa-angle-right", 250, "easeInOutQuad"); + } + }); {% endblock content %} diff --git a/subjects/views.py b/subjects/views.py index 35f31c7..fea7c95 100644 --- a/subjects/views.py +++ b/subjects/views.py @@ -63,6 +63,10 @@ class IndexView(LoginRequiredMixin, ListView): else: categories = self.get_queryset().order_by('name').filter(visible=True) + #Settings subjects for template use + for category in categories: + category.subjects = Subject.objects.all().filter(category= category) + context['categories'] = categories @@ -86,6 +90,7 @@ class SubjectCreateView(CreateView): def get_context_data(self, **kwargs): context = super(SubjectCreateView, self).get_context_data(**kwargs) context['slug'] = self.kwargs['slug'] + context['template_extends'] = 'categories/list.html' return context def form_valid(self, form): @@ -100,7 +105,8 @@ class SubjectCreateView(CreateView): objeto = self.object.name - messages.success(self.request, _('Subject "%s" registered successfully!')%(objeto)) + + messages.success(self.request, _('Subject "%s" was registered on "%s" successfully!')%(objeto, self.kwargs['slug'])) return reverse_lazy('subjects:index') -- libgit2 0.21.2