diff --git a/base/migrations/0009_auto_20160307_0905.py b/base/migrations/0009_auto_20160307_0905.py new file mode 100644 index 000000000..adecc2ac3 --- /dev/null +++ b/base/migrations/0009_auto_20160307_0905.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-03-07 12:05 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('base', '0008_auto_20160216_1015'), + ] + + operations = [ + migrations.AlterField( + model_name='casalegislativa', + name='email', + field=models.EmailField(blank=True, max_length=100, verbose_name='E-mail'), + ), + migrations.AlterField( + model_name='casalegislativa', + name='endereco_web', + field=models.URLField(blank=True, max_length=100, verbose_name='HomePage'), + ), + ] diff --git a/base/models.py b/base/models.py index 8915ff94d..9080d75e0 100644 --- a/base/models.py +++ b/base/models.py @@ -29,9 +29,9 @@ class CasaLegislativa(models.Model): blank=True, upload_to=get_casa_media_path, verbose_name=_('Logotipo')) - endereco_web = models.CharField( + endereco_web = models.URLField( max_length=100, blank=True, verbose_name=_('HomePage')) - email = models.CharField( + email = models.EmailField( max_length=100, blank=True, verbose_name=_('E-mail')) informacao_geral = models.CharField( max_length=100, diff --git a/comissoes/migrations/0004_auto_20160307_0905.py b/comissoes/migrations/0004_auto_20160307_0905.py new file mode 100644 index 000000000..0cad7d62e --- /dev/null +++ b/comissoes/migrations/0004_auto_20160307_0905.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-03-07 12:05 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('comissoes', '0003_auto_20160216_1015'), + ] + + operations = [ + migrations.AlterField( + model_name='comissao', + name='email', + field=models.EmailField(blank=True, max_length=100, verbose_name='E-mail'), + ), + ] diff --git a/comissoes/models.py b/comissoes/models.py index 6876debc2..6e41e0e01 100644 --- a/comissoes/models.py +++ b/comissoes/models.py @@ -67,8 +67,9 @@ class Comissao(models.Model): max_length=100, blank=True, verbose_name=_('Local Reunião')) finalidade = models.TextField( blank=True, verbose_name=_('Finalidade')) - email = models.CharField( - max_length=100, blank=True, verbose_name=_('E-mail')) + email = models.EmailField(max_length=100, + blank=True, + verbose_name=_('E-mail')) unidade_deliberativa = models.BooleanField( choices=YES_NO_CHOICES, verbose_name=_('Unidade Deliberativa')) diff --git a/materia/migrations/0021_auto_20160307_0905.py b/materia/migrations/0021_auto_20160307_0905.py new file mode 100644 index 000000000..b7e65bc30 --- /dev/null +++ b/materia/migrations/0021_auto_20160307_0905.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-03-07 12:05 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0020_auto_20160229_1324'), + ] + + operations = [ + migrations.AlterField( + model_name='acompanhamentomateria', + name='email', + field=models.EmailField(max_length=100, verbose_name='E-mail'), + ), + ] diff --git a/materia/models.py b/materia/models.py index 70282b719..5da4beb89 100644 --- a/materia/models.py +++ b/materia/models.py @@ -136,8 +136,8 @@ class MateriaLegislativa(models.Model): class AcompanhamentoMateria(models.Model): usuario = models.CharField(max_length=50) materia = models.ForeignKey(MateriaLegislativa) - email = models.CharField( - max_length=100, verbose_name=_('Endereço de E-mail')) + email = models.EmailField( + max_length=100, verbose_name=_('E-mail')) data_cadastro = models.DateField(auto_now_add=True) hash = models.CharField(max_length=8) confirmado = models.BooleanField(default=False) diff --git a/parlamentares/migrations/0012_auto_20160307_0905.py b/parlamentares/migrations/0012_auto_20160307_0905.py new file mode 100644 index 000000000..c3d0cac90 --- /dev/null +++ b/parlamentares/migrations/0012_auto_20160307_0905.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-03-07 12:05 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('parlamentares', '0011_auto_20160216_1015'), + ] + + operations = [ + migrations.AlterField( + model_name='parlamentar', + name='email', + field=models.EmailField(blank=True, max_length=100, verbose_name='E-mail'), + ), + migrations.AlterField( + model_name='parlamentar', + name='endereco_web', + field=models.URLField(blank=True, max_length=100, verbose_name='HomePage'), + ), + ] diff --git a/parlamentares/models.py b/parlamentares/models.py index cfa74758b..910d47f25 100644 --- a/parlamentares/models.py +++ b/parlamentares/models.py @@ -253,14 +253,14 @@ class Parlamentar(models.Model): max_length=50, blank=True, verbose_name=_('Fax Residencial')) - endereco_web = models.CharField( + endereco_web = models.URLField( max_length=100, blank=True, verbose_name=_('HomePage')) profissao = models.CharField( max_length=50, blank=True, verbose_name=_('Profissão')) - email = models.CharField( + email = models.EmailField( max_length=100, blank=True, - verbose_name=_('Correio Eletrônico')) + verbose_name=_('E-mail')) locais_atuacao = models.CharField( max_length=100, blank=True,