diff --git a/compilacao/migrations/0027_auto_20151130_1632.py b/compilacao/migrations/0027_auto_20151130_1632.py new file mode 100644 index 000000000..81c64d951 --- /dev/null +++ b/compilacao/migrations/0027_auto_20151130_1632.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('compilacao', '0026_auto_20151122_1756'), + ] + + operations = [ + migrations.AlterModelOptions( + name='nota', + options={'verbose_name': 'Nota', 'ordering': ['-publicacao', '-modified'], 'verbose_name_plural': 'Notas'}, + ), + migrations.AlterField( + model_name='nota', + name='titulo', + field=models.CharField(verbose_name='Título', default='', blank=True, max_length=100), + ), + migrations.AlterField( + model_name='vide', + name='dispositivo_base', + field=models.ForeignKey(verbose_name='Dispositivo Base', related_name='cita', to='compilacao.Dispositivo'), + ), + migrations.AlterField( + model_name='vide', + name='dispositivo_ref', + field=models.ForeignKey(verbose_name='Dispositivo Referido', related_name='citado', to='compilacao.Dispositivo'), + ), + ] diff --git a/compilacao/migrations/0028_auto_20151201_0042.py b/compilacao/migrations/0028_auto_20151201_0042.py new file mode 100644 index 000000000..990c31fbc --- /dev/null +++ b/compilacao/migrations/0028_auto_20151201_0042.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('compilacao', '0027_auto_20151130_1632'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='vide', + unique_together=set([('dispositivo_base', 'dispositivo_ref')]), + ), + ] diff --git a/compilacao/migrations/0029_auto_20151201_1611.py b/compilacao/migrations/0029_auto_20151201_1611.py new file mode 100644 index 000000000..34055d72c --- /dev/null +++ b/compilacao/migrations/0029_auto_20151201_1611.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('compilacao', '0028_auto_20151201_0042'), + ] + + operations = [ + migrations.AlterField( + model_name='nota', + name='publicidade', + field=models.PositiveSmallIntegerField(verbose_name='Nível de Publicidade', choices=[(1, 'Nota Privada'), (2, 'Nota Institucional'), (3, 'Nota Pública')]), + ), + ] diff --git a/norma/migrations/0007_auto_20151130_1632.py b/norma/migrations/0007_auto_20151130_1632.py new file mode 100644 index 000000000..745eda239 --- /dev/null +++ b/norma/migrations/0007_auto_20151130_1632.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('norma', '0006_auto_20151025_1427'), + ] + + operations = [ + migrations.AlterField( + model_name='normajuridica', + name='complemento', + field=models.NullBooleanField(verbose_name='Complementar ?', choices=[(True, 'Sim'), (False, 'Não')]), + ), + ] diff --git a/norma/models.py b/norma/models.py index 875687f1b..d718c3c0d 100644 --- a/norma/models.py +++ b/norma/models.py @@ -3,7 +3,7 @@ from django.template import defaultfilters from django.utils.translation import ugettext_lazy as _ from materia.models import MateriaLegislativa -from sapl.utils import make_choices, YES_NO_CHOICES +from sapl.utils import YES_NO_CHOICES, make_choices class AssuntoNorma(models.Model): diff --git a/static/img/ajax-loader.gif b/static/img/ajax-loader.gif new file mode 100644 index 000000000..812bcf757 Binary files /dev/null and b/static/img/ajax-loader.gif differ