Download as
Browse Code »

Commit fce7c945464d888421286d43c221289a99febdaf

Authored by Jailson Dias
1 parent 4b1b6e9b
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

resolve conflicts

Showing 3 changed files with 2 additions and 3 deletions   Show diff stats
core/decorators.py
  Diff comments   View file @fce7c94
@@ -26,4 +26,4 @@ def log_decorator(log_action = '', log_resource = ''): @@ -26,4 +26,4 @@ def log_decorator(log_action = '', log_resource = ''):
26 26
27 return wraps(view_function)(_decorator) 27 return wraps(view_function)(_decorator)
28 28
29 - return _log_decorator  
30 \ No newline at end of file 29 \ No newline at end of file
  30 + return _log_decorator
core/mixins.py
  Diff comments   View file @fce7c94
@@ -17,4 +17,4 @@ class LogMixin(object): @@ -17,4 +17,4 @@ class LogMixin(object):
17 17
18 log.save() 18 log.save()
19 19
20 - return super(LogMixin, self).dispatch(request, *args, **kwargs)  
21 \ No newline at end of file 20 \ No newline at end of file
  21 + return super(LogMixin, self).dispatch(request, *args, **kwargs)
users/views.py
  Diff comments   View file @fce7c94
@@ -149,4 +149,3 @@ class UpdateUser(LoginRequiredMixin, generic.edit.UpdateView): @@ -149,4 +149,3 @@ class UpdateUser(LoginRequiredMixin, generic.edit.UpdateView):
149 messages.success(self.request, _('Profile edited successfully!')) 149 messages.success(self.request, _('Profile edited successfully!'))
150 150
151 return super(UpdateUser, self).form_valid(form) 151 return super(UpdateUser, self).form_valid(form)
152 -