Download as
Browse Code »

Commit 25ed30ee10cbfa18e896109466699af7c3061f52

Authored by Felipe Henrique de Almeida Bormann
1 parent 056537b2
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

upgraded django version and changed create view answer

Showing 3 changed files with 24 additions and 2 deletions   Show diff stats
requirements.txt
  Diff comments   View file @25ed30e
... ... @@ -4,7 +4,7 @@ coverage==4.2
4 4 decorator==4.0.10
5 5 deps==0.1.0
6 6 dj-database-url==0.4.1
7   -Django==1.10
  7 +Django==1.10.4
8 8 django-autoslug==1.9.3
9 9 django-bootstrap-breadcrumbs==0.8
10 10 django-braces==1.10.0
... ...
subjects/templates/subjects/create.html
  Diff comments   View file @25ed30e
... ... @@ -89,6 +89,22 @@
89 89 this.qs2.cache();
90 90 }
91 91 });// Used to create multi-select css style
  92 +
  93 + $('.collapse').on('show.bs.collapse', function (e) {
  94 + if($(this).is(e.target)){
  95 + var btn = $(this).parent().find('.fa-angle-right');
  96 +
  97 + btn.switchClass("fa-angle-right", "fa-angle-down", 250, "easeInOutQuad");
  98 + }
  99 + });
  100 +
  101 + $('.collapse').on('hide.bs.collapse', function (e) {
  102 + if($(this).is(e.target)){
  103 + var btn = $(this).parent().find('.fa-angle-down');
  104 +
  105 + btn.switchClass("fa-angle-down", "fa-angle-right", 250, "easeInOutQuad");
  106 + }
  107 + });
92 108 </script>
93 109 {% endblock content %}
94 110  
... ...
subjects/views.py
  Diff comments   View file @25ed30e
... ... @@ -63,6 +63,10 @@ class IndexView(LoginRequiredMixin, ListView):
63 63 else:
64 64 categories = self.get_queryset().order_by('name').filter(visible=True)
65 65  
  66 + #Settings subjects for template use
  67 + for category in categories:
  68 + category.subjects = Subject.objects.all().filter(category= category)
  69 +
66 70  
67 71 context['categories'] = categories
68 72  
... ... @@ -86,6 +90,7 @@ class SubjectCreateView(CreateView):
86 90 def get_context_data(self, **kwargs):
87 91 context = super(SubjectCreateView, self).get_context_data(**kwargs)
88 92 context['slug'] = self.kwargs['slug']
  93 + context['template_extends'] = 'categories/list.html'
89 94 return context
90 95 def form_valid(self, form):
91 96  
... ... @@ -100,7 +105,8 @@ class SubjectCreateView(CreateView):
100 105  
101 106  
102 107 objeto = self.object.name
103   - messages.success(self.request, _('Subject "%s" registered successfully!')%(objeto))
  108 +
  109 + messages.success(self.request, _('Subject "%s" was registered on "%s" successfully!')%(objeto, self.kwargs['slug']))
104 110 return reverse_lazy('subjects:index')
105 111  
106 112  
... ...