Merge pull request #242 from interlegis/235-usar-emailfield-urlfield

235 usar emailfield urlfield

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'),
+        ),
+    ]

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,

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'),
+        ),
+    ]

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'))

compilacao/migrations/0044_auto_20160307_0918.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-03-07 12:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('compilacao', '0043_auto_20160110_1733'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='nota',
+            name='url_externa',
+            field=models.URLField(blank=True, max_length=1024, verbose_name='Url externa'),
+        ),
+        migrations.AlterField(
+            model_name='publicacao',
+            name='url_externa',
+            field=models.URLField(blank=True, max_length=1024, verbose_name='Link para Versão Eletrônica'),
+        ),
+    ]

compilacao/models.py

@@ -459,7 +459,7 @@ class Publicacao(TimestampedMixin):
     edicao = models.PositiveIntegerField(
         blank=True, null=True, verbose_name=_('Edição'))
 
-    url_externa = models.CharField(
+    url_externa = models.URLField(
         max_length=1024,
         blank=True,
         verbose_name=_('Link para Versão Eletrônica'))
@@ -1169,7 +1169,7 @@ class Nota(TimestampedMixin):
         default='',
         blank=True)
     texto = models.TextField(verbose_name=_('Texto'))
-    url_externa = models.CharField(
+    url_externa = models.URLField(
         max_length=1024,
         blank=True,
         verbose_name=_('Url externa'))

lexml/migrations/0004_auto_20160307_0918.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-03-07 12:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lexml', '0003_auto_20160216_1015'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='lexmlprovedor',
+            name='email_responsavel',
+            field=models.EmailField(blank=True, max_length=50, verbose_name='E-mail do responsável'),
+        ),
+        migrations.AlterField(
+            model_name='lexmlpublicador',
+            name='email_responsavel',
+            field=models.EmailField(blank=True, max_length=50, verbose_name='E-mail do responsável'),
+        ),
+    ]

lexml/models.py

@@ -6,7 +6,7 @@ class LexmlProvedor(models.Model):  # LexmlRegistroProvedor
     id_provedor = models.PositiveIntegerField(verbose_name=_('Id do provedor'))
     nome = models.CharField(max_length=255, verbose_name=_('Nome do provedor'))
     sigla = models.CharField(max_length=15)
-    email_responsavel = models.CharField(
+    email_responsavel = models.EmailField(
         max_length=50,
         blank=True,
         verbose_name=_('E-mail do responsável'))
@@ -34,7 +34,7 @@ class LexmlPublicador(models.Model):
         verbose_name=_('Id do publicador'))
     nome = models.CharField(
         max_length=255, verbose_name=_('Nome do publicador'))
-    email_responsavel = models.CharField(
+    email_responsavel = models.EmailField(
         max_length=50,
         blank=True,
         verbose_name=_('E-mail do responsável'))

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'),
+        ),
+    ]

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)

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'),
+        ),
+    ]

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,

sessao/migrations/0015_auto_20160307_0918.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-03-07 12:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sessao', '0014_auto_20160223_0813'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='orador',
+            name='url_discurso',
+            field=models.URLField(blank=True, max_length=150, verbose_name='URL Vídeo'),
+        ),
+        migrations.AlterField(
+            model_name='oradorexpediente',
+            name='url_discurso',
+            field=models.URLField(blank=True, max_length=150, verbose_name='URL Vídeo'),
+        ),
+        migrations.AlterField(
+            model_name='sessaoplenaria',
+            name='url_audio',
+            field=models.URLField(blank=True, max_length=150, verbose_name='URL Arquivo Áudio (Formatos MP3 / AAC)'),
+        ),
+        migrations.AlterField(
+            model_name='sessaoplenaria',
+            name='url_video',
+            field=models.URLField(blank=True, max_length=150, verbose_name='URL Arquivo Vídeo (Formatos MP4 / FLV / WebM)'),
+        ),
+    ]

sessao/models.py

@@ -53,10 +53,10 @@ class SessaoPlenaria(models.Model):
     numero = models.PositiveIntegerField(verbose_name=_('Número'))
     data_fim = models.DateField(
         blank=True, null=True, verbose_name=_('Encerramento'))
-    url_audio = models.CharField(
+    url_audio = models.URLField(
         max_length=150, blank=True,
         verbose_name=_('URL Arquivo Áudio (Formatos MP3 / AAC)'))
-    url_video = models.CharField(
+    url_video = models.URLField(
         max_length=150, blank=True,
         verbose_name=_('URL Arquivo Vídeo (Formatos MP4 / FLV / WebM)'))
     upload_pauta = models.FileField(
@@ -171,7 +171,7 @@ class AbstractOrador(models.Model):  # Oradores
     parlamentar = models.ForeignKey(Parlamentar, verbose_name=_('Parlamentar'))
     numero_ordem = models.PositiveIntegerField(
         verbose_name=_('Ordem de pronunciamento'))
-    url_discurso = models.CharField(
+    url_discurso = models.URLField(
         max_length=150, blank=True, verbose_name=_('URL Vídeo'))
 
     class Meta: