diff --git a/links/views.py b/links/views.py index 10fed9f..914849d 100644 --- a/links/views.py +++ b/links/views.py @@ -21,7 +21,7 @@ from topics.models import Topic class CreateLinkView(LoginRequiredMixin, LogMixin, generic.edit.CreateView): log_component = 'resources' log_action = 'create' - log_resource = 'file_link' + log_resource = 'links' log_context = {} login_url = reverse_lazy("users:login") @@ -176,14 +176,17 @@ class DeleteLinkView(LoginRequiredMixin, LogMixin, generic.edit.DeleteView): self.log_context['link_id'] = self.object.id self.log_context['link_name'] = self.object.name self.log_context['link_slug'] = self.object.slug - + super(DeleteLinkView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) return reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug}) class DetailLinkView(LoginRequiredMixin, LogMixin, generic.detail.DetailView): - + log_component = 'resources' + log_action = 'view' + log_resource = 'links' + log_context = {} login_url = reverse_lazy("users:login") redirect_field_name = 'next' @@ -192,6 +195,11 @@ class DetailLinkView(LoginRequiredMixin, LogMixin, generic.detail.DetailView): context_object_name = 'web_link' class UpdateLinkView(LoginRequiredMixin, LogMixin, generic.edit.UpdateView): + + log_component = 'resources' + log_action = 'update' + log_resource = 'links' + log_context = {} model = Link form_class = LinkForm template_name = 'links/update.html' diff --git a/pdf_file/views.py b/pdf_file/views.py index 74942a6..8e65cc0 100644 --- a/pdf_file/views.py +++ b/pdf_file/views.py @@ -19,9 +19,12 @@ from pendencies.forms import PendenciesForm -class ViewPDFFile(generic.TemplateView): +class ViewPDFFile(LoginRequiredMixin, LogMixin, generic.TemplateView): template_name='pdf_file/view.html' - + log_component = 'resources' + log_action = 'view' + log_resource = 'pdf_file' + log_context = {} def dispatch(self, request, *args, **kwargs): slug = self.kwargs.get('slug', '') resource = get_object_or_404(Resource, slug = slug) @@ -38,6 +41,23 @@ class ViewPDFFile(generic.TemplateView): pdf_file = PDFFile.objects.get(slug=slug) context['pdf_file'] = pdf_file context['subject'] = pdf_file.topic.subject + + + self.log_context['category_id'] = pdf_file.topic.subject.category.id + self.log_context['category_name'] = pdf_file.topic.subject.category.name + self.log_context['category_slug'] = pdf_file.topic.subject.category.slug + self.log_context['subject_id'] = pdf_file.topic.subject.id + self.log_context['subject_name'] = pdf_file.topic.subject.name + self.log_context['subject_slug'] = pdf_file.topic.subject.slug + self.log_context['topic_id'] = pdf_file.topic.id + self.log_context['topic_name'] = pdf_file.topic.name + self.log_context['topic_slug'] = pdf_file.topic.slug + self.log_context['pdf_id'] = pdf_file.id + self.log_context['pdf_name'] = pdf_file.name + self.log_context['pdf_slug'] = pdf_file.slug + + super(ViewPDFFile, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) + return context -- libgit2 0.21.2