Download as
Browse Code »

Commit 84f2c8a9d9dd5d209bca48e44ce96791020e11df

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

fixed error on redirect of createview and added removing option functional for subject view

Showing 2 changed files with 9 additions and 4 deletions   Show diff stats
subjects/templates/subjects/view.html
  Diff comments   View file @84f2c8a
... ... @@ -5,6 +5,7 @@
5 5  
6 6 {% block javascript%}
7 7 {{ block.super }}
  8 + <script type="text/javascript" src="{% static 'subjects/js/modal_subject.js' %}"></script>
8 9 {% endblock%}
9 10  
10 11 {% block breadcrumbs %}
... ... @@ -91,6 +92,9 @@
91 92 </div>
92 93 </div>
93 94  
  95 + <div id="modal_subject"></div>
  96 +
  97 +
94 98 <script type="text/javascript">
95 99 {% if resource_new_page %}
96 100 window.open("{{ resource_new_page_url }}");
... ...
subjects/views.py
  Diff comments   View file @84f2c8a
... ... @@ -178,6 +178,7 @@ class SubjectCreateView(LoginRequiredMixin, CreateView):
178 178 def dispatch(self, request, *args, **kwargs):
179 179 user = request.user
180 180 pk = user.pk
  181 +
181 182 if kwargs.get('subject_slug'):
182 183 subject = Subject.objects.filter((Q(professor__pk=pk) | Q(category__coordinators__pk=pk)) & Q(slug = kwargs.get('subject_slug')))
183 184 if not user.is_staff:
... ... @@ -189,9 +190,9 @@ class SubjectCreateView(LoginRequiredMixin, CreateView):
189 190  
190 191  
191 192 if kwargs.get('slug'):
192   - subject = Subject.objects.filter((Q(professor__pk=pk) | Q(category__coordinators__pk=pk)) & Q(slug = kwargs.get('slug')))
193 193 if not user.is_staff:
194   - if subject.count() == 0:
  194 + category = Category.objects.filter(Q(coordinators__pk=pk) & Q(slug= kwargs.get('slug')))
  195 + if category.count() == 0:
195 196 if request.META.get('HTTP_REFERER'):
196 197 return HttpResponseRedirect(request.META.get('HTTP_REFERER'))
197 198 else:
... ... @@ -316,7 +317,7 @@ class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView):
316 317 model = Subject
317 318 template_name = 'subjects/delete.html'
318 319  
319   - def dispatch(self,request, *args, **kwargs):
  320 + def dispatch(self, request, *args, **kwargs):
320 321 user = self.request.user
321 322  
322 323 pk = user.pk
... ... @@ -328,7 +329,7 @@ class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView):
328 329 return HttpResponseRedirect(request.META.get('HTTP_REFERER'))
329 330 else:
330 331 return redirect('subjects:index')
331   - return super(SubjectDeleteView, self).dispatch(*args, **kwargs)
  332 + return super(SubjectDeleteView, self).dispatch(request, *args, **kwargs)
332 333  
333 334 def get(self, request, *args, **kwargs):
334 335 self.object = self.get_object()
... ...