diff --git a/subjects/static/subjects/js/modal_subject.js b/subjects/static/subjects/js/modal_subject.js new file mode 100644 index 0000000..7088b0e --- /dev/null +++ b/subjects/static/subjects/js/modal_subject.js @@ -0,0 +1,27 @@ +var RemoveSubject = { + remove: function(url,dados,id_li_link){ + $("#subject").modal('toggle'); + $.post(url,dados, function(data){ + $(id_li_link).remove(); + $('body').removeClass('modal-open'); + $("#modal_course").empty(); + $(".modal-backdrop.in").remove(); + alertify.success("Subject removed successfully!"); + }).fail(function(){ + $("#modal_course").empty(); + $("#modal_course").append(data); + $('#subject').modal('show'); + }); + } +} +var delete_subject = { + get: function (url, id_modal, id_div_modal){ + $.get(url, function(data){ + if($(id_modal).length){ + $(id_div_modal).empty(); + } + $(id_div_modal).append(data); + $(id_modal).modal('show'); + }); + } +}; \ No newline at end of file diff --git a/subjects/templates/subjects/delete.html b/subjects/templates/subjects/delete.html new file mode 100644 index 0000000..ac9c5b8 --- /dev/null +++ b/subjects/templates/subjects/delete.html @@ -0,0 +1,37 @@ +{% load static i18n permission_tags %} + + + \ No newline at end of file diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html index 0d9e2e5..eb0ae2b 100644 --- a/subjects/templates/subjects/list.html +++ b/subjects/templates/subjects/list.html @@ -5,6 +5,7 @@ {% block javascript%} {{ block.super }} + {% endblock%} {% block breadcrumbs %} @@ -67,7 +68,8 @@
  • {% trans 'Replicate' %}
  • {% endif %}
  • {% trans 'Edit' %}
  • -
  •  {% trans 'Remove' %}
  • +
  • +
  • {% endif %} diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html index 32c3ebd..06803c1 100644 --- a/subjects/templates/subjects/subject_card.html +++ b/subjects/templates/subjects/subject_card.html @@ -27,7 +27,7 @@ {% endif %} diff --git a/subjects/urls.py b/subjects/urls.py index 76356c2..a7758eb 100644 --- a/subjects/urls.py +++ b/subjects/urls.py @@ -8,5 +8,6 @@ urlpatterns = [ url(r'^create/(?P[\w_-]+)/$', views.SubjectCreateView.as_view(), name='create'), url(r'^replicate/(?P[\w_-]+)/$', views.SubjectCreateView.as_view(), name='replicate'), url(r'^update/(?P[\w_-]+)/$', views.SubjectUpdateView.as_view(), name='update'), + url(r'^delete/(?P[\w_-]+)/$', views.SubjectDeleteView.as_view(), name='delete'), #url(r'^modal/(?P[\w_-]+)/$', views.subscribe_subject(), name='subscribe'), ] \ No newline at end of file diff --git a/subjects/views.py b/subjects/views.py index fb5ac34..b42fd59 100644 --- a/subjects/views.py +++ b/subjects/views.py @@ -203,6 +203,32 @@ class SubjectUpdateView(LogMixin, UpdateView): return reverse_lazy('subjects:index') + +class SubjectDeleteView(LoginRequiredMixin, HasRoleMixin, LogMixin, DeleteView): + + login_url = reverse_lazy("users:login") + redirect_field_name = 'next' + model = Subject + template_name = 'subject/delete.html' + + def dispatch(self, *args, **kwargs): + subject = get_object_or_404(Subject, slug = self.kwargs.get('slug')) + + return super(SubjectDeleteView, self).dispatch(*args, **kwargs) + + def get_context_data(self, **kwargs): + context = super(SubjectDeleteView, self).get_context_data(**kwargs) + + return context + + def get_success_url(self): + + + + #super(DeleteSubjectView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) + + return reverse_lazy('subjects:index') + def subscribe_subject(request, subject_slug): subject = get_object_or_404(Subject, slug= subject_slug) subject.students.add(request.user) -- libgit2 0.21.2