Changeset 8ec6ee3 in firmaeventos

Timestamp:

Nov 20, 2017, 3:56:59 PM (6 years ago)

Author:

lhernandez <lhernandez@…>

Branches:

master

Children:

d3c0ab7

Parents:

16cf088

Message:

Acomodando mezcla

File:

• eventos/views.py (modified) (6 diffs)

eventos/views.py

@@ -1 @@
-<<<<<<< HEAD
 from django.contrib import messages
 from django.core.urlresolvers import reverse_lazy
@@ -5 +4 @@
     render, redirect, get_object_or_404
 )
-=======
-from django.shortcuts import render
 from django.views.generic import ListView, FormView
->>>>>>> def10d28a56c05436aa09889ff50481aaec4bc4a
+
 from multi_form_view import MultiModelFormView
-from django.views.generic import FormView
 
 from .forms import *
@@ -17 +13 @@
 )
 from .models import Evento
+
 
 class RegisterEvent(FormView):
@@ -29 +26 @@
 
     template_name = "register.event.html"
-<<<<<<< HEAD
     form_class = EventoForm
     form_participante = FormsetParticipanteEvento
@@ -58 +54 @@
                          (str(self.form_class.errors, self.form_participante.errors)))
         return redirect(self.success_url)
-=======
-    form_classes = {
-      'event': EventoForm,
-      'participante': FormsetParticipanteEvento,
-    }
-    #success_url = reverse_lazy('users:home')
-    record_id=None
 
 
@@ -105 +94 @@
         kwargs['nombre_evento'] = Evento.objects.get(pk=int(self.kwargs['pk']))
         return super(SignEvent, self).get_context_data(**kwargs)
->>>>>>> def10d28a56c05436aa09889ff50481aaec4bc4a