Altera requirements, views e forms

parlamentares/forms.py

@@ -138,11 +138,15 @@ class ParlamentaresForm (ModelForm):
                              src="{{ MEDIA_URL }}{{ form.fotografia.value }}">
                              <br /><br />
                         <input type="submit"
-                               name="remover"
-                               id="remover"
+                               name="remover-foto"
+                               id="remover-foto"
                                class="btn btn-warning"
                                value="Remover Foto"/>
+<<<<<<< HEAD
                            {% endif %}                               
+=======
+                           {% endif %}
+>>>>>>> 490fffbf4e0e50be52d47056821e7f626ce76dcd
                          {% endif %}""", ),
                      row14,
                      form_actions())

parlamentares/views.py

@@ -1,9 +1,11 @@
 import os
 
+from braces.views import FormMessagesMixin
 from django.contrib import messages
-from django.core.urlresolvers import reverse
+from django.core.urlresolvers import reverse, reverse_lazy
+from django.http import HttpResponseRedirect
 from django.utils.translation import ugettext_lazy as _
-from django.views.generic import FormView
+from django.views.generic import CreateView, FormView, UpdateView
 
 from crud import Crud
 

requirements/requirements.txt

@@ -17,3 +17,4 @@ pytz==2015.7
 pyyaml==3.11
 rtyaml==0.0.2
 unipath==1.1
+python-magic==0.4.10