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/compilacao/migrations/0030_auto_20151203_1514.py b/compilacao/migrations/0032_auto_20151213_1538.py similarity index 87% rename from compilacao/migrations/0030_auto_20151203_1514.py rename to compilacao/migrations/0032_auto_20151213_1538.py index 3bff2a458..db6a23ec7 100644 --- a/compilacao/migrations/0030_auto_20151203_1514.py +++ b/compilacao/migrations/0032_auto_20151213_1538.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('compilacao', '0029_auto_20151201_1611'), + ('compilacao', '0031_merge'), ] operations = [ diff --git a/static/js/compilacao_view.js b/static/js/compilacao_view.js index b661399cd..a39a23889 100644 --- a/static/js/compilacao_view.js +++ b/static/js/compilacao_view.js @@ -24,8 +24,8 @@ function textoMultiVigente(item, diff) { if (diff) { $(".dtxt[id^='da'").each(function() { - - if ($(this).html().indexOf('') > 0) + + if ( $(this).html().search( /<\/\w+>/g ) > 0) return; var pk = $(this).attr('pk') @@ -44,7 +44,7 @@ function textoMultiVigente(item, diff) { var diff = JsDiff.diffWordsWithSpace($(a).text(), $(b).text()); if (diff.length > 0) { - $('#d'+pk).addClass("displaynone"); + $('#d'+pks).closest('.desativado').addClass("displaynone"); var clone = $('#da'+pk).clone(); $('#da'+pk).after( clone );