Changeset a3deb5f in firmaeventos

Timestamp:

Nov 28, 2017, 11:50:25 AM (6 years ago)

Author:

lhernandez <lhernandez@…>

Branches:

master

Children:

9c25cd2

Parents:

c152e07 (diff), 030dea5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/cenditel-desarrollo/FirmaEventos

Files:

• LICENSE (added)
• eventos/views.py (modified) (1 diff)
• users/views.py (modified) (2 diffs)

eventos/views.py

@@ -258 +258 @@
 
 
-class UpdateFileEvent(FormView):
+class UpdateFileEvent(LoginRequiredMixin, FormView):
     """!
     Clase que permite actualizar subir un archivo a un evento que no se haya cargado

users/views.py

@@ -72 +72 @@
             print (e)
 
+
         usuario = authenticate(username=usuario, password=contrasena)
+        print(usuario, contrasena)
         if usuario is not None:
             login(self.request, usuario)
@@ -81 +83 @@
             messages.info(self.request, MENSAJES_START['INICIO_SESION'] % (usuario.first_name, usuario.username))
         else:
+            self.success_url = reverse_lazy('users:login')
             user = User.objects.filter(username=form.cleaned_data['usuario'])
             if user:
                 user = user.get()
                 if not user.is_active:
-                    self.success_url = reverse_lazy('users:login')
                     messages.error(self.request, MENSAJES_LOGIN['CUENTA_INACTIVA'])
-            else:
-                self.success_url = reverse_lazy('users:login')
-                messages.warning(self.request, MENSAJES_LOGIN['LOGIN_USUARIO_NO_VALIDO'])
+                else:
+                    messages.warning(self.request, MENSAJES_LOGIN['LOGIN_USUARIO_NO_VALIDO'])
 
         return super(LoginView, self).form_valid(form)