Browse Source

cria template tag para tratar chunk-vendors

pull/2485/head
Leandro Roberto 7 years ago
parent
commit
88104b215e
  1. 1
      sapl-frontend/src/apps/compilacao/main.js
  2. 1
      sapl-frontend/vue.config.js
  3. 12
      sapl/base/templatetags/common_tags.py
  4. 4
      sapl/templates/base.html
  5. 2
      sapl/templates/compilacao/text_edit.html
  6. 2
      webpack-stats.json

1
sapl-frontend/src/apps/compilacao/main.js

@ -8,7 +8,6 @@ import compilacaoNotas from './js/old/compilacao_notas'
import './js/old/compilacao_edit' import './js/old/compilacao_edit'
_.forEach(_.merge(_.merge(compilacao, compilacaoNotas), compilacaoView), function (func, key) { _.forEach(_.merge(_.merge(compilacao, compilacaoNotas), compilacaoView), function (func, key) {
window[key] = func window[key] = func
}) })

1
sapl-frontend/vue.config.js

@ -44,6 +44,7 @@ module.exports = {
.mode('development') .mode('development')
.devtool('cheap-module-eval-source-map') .devtool('cheap-module-eval-source-map')
config config
.plugin('RelativeBundleTrackerPlugin') .plugin('RelativeBundleTrackerPlugin')
.use(RelativeBundleTrackerPlugin, [{ .use(RelativeBundleTrackerPlugin, [{

12
sapl/base/templatetags/common_tags.py

@ -1,5 +1,7 @@
from django import template from django import template
from django.template.defaultfilters import stringfilter from django.template.defaultfilters import stringfilter
from django.utils.safestring import mark_safe
from webpack_loader import utils
from sapl.base.models import AppConfig from sapl.base.models import AppConfig
from sapl.materia.models import DocumentoAcessorio, MateriaLegislativa, Proposicao from sapl.materia.models import DocumentoAcessorio, MateriaLegislativa, Proposicao
@ -274,3 +276,13 @@ def filiacao_data_filter(parlamentar, data_inicio):
@register.filter @register.filter
def filiacao_intervalo_filter(parlamentar, date_range): def filiacao_intervalo_filter(parlamentar, date_range):
return filiacao_data(parlamentar, date_range[0], date_range[1]) return filiacao_data(parlamentar, date_range[0], date_range[1])
@register.simple_tag
def render_chunk_vendors(extension=None):
try:
tags = utils.get_as_tags(
'chunk-vendors', extension=extension, config='DEFAULT', attrs='')
return mark_safe('\n'.join(tags))
except:
return ''

4
sapl/templates/base.html

@ -16,7 +16,7 @@
{% block head_content %} {% block head_content %}
<link rel="icon" href="{% webpack_static 'img/favicon.ico' %}" type="image/png" > <link rel="icon" href="{% webpack_static 'img/favicon.ico' %}" type="image/png" >
{% block webpack_loader_css %} {% block webpack_loader_css %}
{% render_bundle 'chunk-vendors' 'css' %} {% render_chunk_vendors 'css' %}
{% render_bundle 'global' 'css' %} {% render_bundle 'global' 'css' %}
{% endblock webpack_loader_css %} {% endblock webpack_loader_css %}
@ -227,7 +227,7 @@
{% block foot_js %} {% block foot_js %}
{% block webpack_loader_js %} {% block webpack_loader_js %}
{% render_bundle 'chunk-vendors' 'js' %} {% render_chunk_vendors 'js' %}
{% render_bundle 'global' 'js' %} {% render_bundle 'global' 'js' %}
{% endblock webpack_loader_js %} {% endblock webpack_loader_js %}

2
sapl/templates/compilacao/text_edit.html

@ -13,7 +13,7 @@
<div class="actions btn-toolbar float-right" role="toolbar"> <div class="actions btn-toolbar float-right" role="toolbar">
<div class="actions btn-group" role="group"> <div class="actions btn-group" role="group">
{% if perms.compilacao.lock_unlock_textoarticulado and not object.editable_only_by_owners%} {% if perms.compilacao.lock_unlock_textoarticulado and not object.editable_only_by_owners%}
<a href="{% url 'sapl.compilacao:ta_text_edit' object.pk %}?{% if object.editing_locked %}unlock{%else%}lock{% endif %}" class="btn btn-outline-primary {% if object.editing_locked %}btn-outline-danger{%else%}btn-primary{% endif %}">{% if object.editing_locked %}{% trans 'Desbloquear Edição' %}{%else%}{% trans 'Publicar Texto' %}{% endif %}</a> <a href="{% url 'sapl.compilacao:ta_text_edit' object.pk %}?{% if object.editing_locked %}unlock{%else%}lock{% endif %}" class="btn {% if object.editing_locked %}btn-outline-danger{%else%}btn-outline-primary{% endif %}">{% if object.editing_locked %}{% trans 'Desbloquear Edição' %}{%else%}{% trans 'Publicar Texto' %}{% endif %}</a>
{% endif %} {% endif %}
<a href="{% url 'sapl.compilacao:ta_edit' object.pk %}" class="btn btn-outline-primary">{% trans 'Editar Metadados do Texto Articulado' %}</a> <a href="{% url 'sapl.compilacao:ta_edit' object.pk %}" class="btn btn-outline-primary">{% trans 'Editar Metadados do Texto Articulado' %}</a>

2
webpack-stats.json

@ -1 +1 @@
{"status":"done","publicPath":"/static/","chunks":{"chunk-vendors":[{"name":"css/chunk-vendors.7ccaa4c3.css","publicPath":"/static/css/chunk-vendors.7ccaa4c3.css","path":"../sapl/static/css/chunk-vendors.7ccaa4c3.css"},{"name":"js/chunk-vendors.e63ea81d.js","publicPath":"/static/js/chunk-vendors.e63ea81d.js","path":"../sapl/static/js/chunk-vendors.e63ea81d.js"}],"compilacao":[{"name":"css/compilacao.8f6b7cdb.css","publicPath":"/static/css/compilacao.8f6b7cdb.css","path":"../sapl/static/css/compilacao.8f6b7cdb.css"},{"name":"js/compilacao.5ddb3dc9.js","publicPath":"/static/js/compilacao.5ddb3dc9.js","path":"../sapl/static/js/compilacao.5ddb3dc9.js"}],"global":[{"name":"css/global.8608d5e7.css","publicPath":"/static/css/global.8608d5e7.css","path":"../sapl/static/css/global.8608d5e7.css"},{"name":"js/global.f4c03912.js","publicPath":"/static/js/global.f4c03912.js","path":"../sapl/static/js/global.f4c03912.js"}],"sapl-oficial-theme":[{"name":"js/sapl-oficial-theme.391f1e2f.js","publicPath":"/static/js/sapl-oficial-theme.391f1e2f.js","path":"../sapl/static/js/sapl-oficial-theme.391f1e2f.js"}]}} {"status":"done","publicPath":"/static/","chunks":{"chunk-vendors":[{"name":"css/chunk-vendors.7ccaa4c3.css","publicPath":"/static/css/chunk-vendors.7ccaa4c3.css","path":"../sapl/static/css/chunk-vendors.7ccaa4c3.css"},{"name":"js/chunk-vendors.e63ea81d.js","publicPath":"/static/js/chunk-vendors.e63ea81d.js","path":"../sapl/static/js/chunk-vendors.e63ea81d.js"}],"compilacao":[{"name":"css/compilacao.8f6b7cdb.css","publicPath":"/static/css/compilacao.8f6b7cdb.css","path":"../sapl/static/css/compilacao.8f6b7cdb.css"},{"name":"js/compilacao.196359a8.js","publicPath":"/static/js/compilacao.196359a8.js","path":"../sapl/static/js/compilacao.196359a8.js"}],"global":[{"name":"css/global.8608d5e7.css","publicPath":"/static/css/global.8608d5e7.css","path":"../sapl/static/css/global.8608d5e7.css"},{"name":"js/global.f4c03912.js","publicPath":"/static/js/global.f4c03912.js","path":"../sapl/static/js/global.f4c03912.js"}],"sapl-oficial-theme":[{"name":"js/sapl-oficial-theme.391f1e2f.js","publicPath":"/static/js/sapl-oficial-theme.391f1e2f.js","path":"../sapl/static/js/sapl-oficial-theme.391f1e2f.js"}]}}
Loading…
Cancel
Save