Conjunto de cambios 08c074e en seguimiento_proyectos para sepai/users

Fecha y hora:

15/06/2017 11:18:58 (hace 7 años)

Autor:

lhernandez <lhernandez@…>

Branches:

master, desarrollo

Children:

94d213e

Parents:

6bdfd1d (diferencia), de2ff87 (diferencia)
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.

Mensaje:

Merge branch 'desarrollo' of ​https://planificacion.cenditel.gob.ve/scm/git/seguimiento_proyectos

Ubicación:

sepai/users

Ficheros:

• migrations/__pycache__/0001_initial.cpython-34.pyc (borrado)
• migrations/__pycache__/__init__.cpython-34.pyc (borrado)
• views.py (modificado) (3 diferencias)

sepai/users/views.py

@@ -328 +328 @@
 
     def forms_invalid(self, forms, **kwargs):
-        messages.danger(self.request, forms.errors)
+        messages.error(self.request, forms)
         return super(RegisterComunView, self).forms_invalid(forms)
 
@@ -364 +364 @@
         try:
             record = self.model.objects.select_related().get(fk_user=self.record_id)
-        except User.DoesNotExist:
+        except UserProfile.DoesNotExist:
             record = None
         context['upUser'] = record
@@ -377 +377 @@
         try:
             record = self.model.objects.select_related().get(fk_user=self.record_id)
-        except User.DoesNotExist:
+        except UserProfile.DoesNotExist:
             record = None
         return {