diff --git a/compilacao/migrations/0030_auto_20151203_1114.py b/compilacao/migrations/0030_auto_20151203_1114.py new file mode 100644 index 000000000..27b47f052 --- /dev/null +++ b/compilacao/migrations/0030_auto_20151203_1114.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('compilacao', '0029_auto_20151201_1611'), + ] + + operations = [ + migrations.AlterField( + model_name='tipodispositivo', + name='relacoes_diretas_pai_filho', + field=models.ManyToManyField(to='compilacao.TipoDispositivo', related_name='+', through='compilacao.TipoDispositivoRelationship'), + ), + ] diff --git a/compilacao/migrations/0030_auto_20151203_1117.py b/compilacao/migrations/0030_auto_20151203_1117.py new file mode 100644 index 000000000..4daa1e950 --- /dev/null +++ b/compilacao/migrations/0030_auto_20151203_1117.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('compilacao', '0029_auto_20151201_1611'), + ] + + operations = [ + migrations.AlterField( + model_name='tipodispositivo', + name='relacoes_diretas_pai_filho', + field=models.ManyToManyField(to='compilacao.TipoDispositivo', through='compilacao.TipoDispositivoRelationship', related_name='+'), + ), + ] diff --git a/static/js/compilacao_view.js b/static/js/compilacao_view.js index 1e44e635e..e02bd2471 100644 --- a/static/js/compilacao_view.js +++ b/static/js/compilacao_view.js @@ -46,7 +46,7 @@ function textoMultiVigente(item, diff) { break; } } - + $(".cp .tipo-vigencias a").removeClass("selected") $(item).addClass("selected") $(".dptt.desativado").removeClass("displaynone"); @@ -56,8 +56,9 @@ function textoMultiVigente(item, diff) { if (diff) { $(".dtxt[id^='da'").each(function() { - + if ( $(this).html().search( /<\/\w+>/g ) > 0) + return; var pk = $(this).attr('pk') @@ -142,6 +143,7 @@ function textoVigente(item, link) { }, 0); } + } $(document).ready(function() {