SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix #734

pull/735/head
LeandroRoberto 8 years ago
parent
f135853523
commit
5debab804f
4 changed files with 94 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      sapl/comissoes/views.py
  2. 109
      sapl/crud/base.py
  3. 33
      sapl/templates/comissoes/composicao_detail.html
  4. 3
      sapl/templates/crud/detail_detail.html

22
sapl/comissoes/views.py
View File

@ -3,7 +3,7 @@ from django.core.urlresolvers import reverse
from django.db.models import F from django.db.models import F
from django.views.generic import ListView from django.views.generic import ListView
from sapl.crud.base import Crud, CrudAux, MasterDetailCrud from sapl.crud.base import Crud, CrudAux, MasterDetailCrud, RP_DETAIL, RP_LIST
from sapl.materia.models import MateriaLegislativa, Tramitacao from sapl.materia.models import MateriaLegislativa, Tramitacao
from .models import (CargoComissao, Comissao, Composicao, Participacao, from .models import (CargoComissao, Comissao, Composicao, Participacao,
@ -27,40 +27,30 @@ TipoComissaoCrud = CrudAux.build(
class ParticipacaoCrud(MasterDetailCrud): class ParticipacaoCrud(MasterDetailCrud):
model = Participacao model = Participacao
parent_field = 'composicao__comissao' parent_field = 'composicao__comissao'
public = [RP_DETAIL, ]
ListView = None
is_m2m = True
class BaseMixin(MasterDetailCrud.BaseMixin): class BaseMixin(MasterDetailCrud.BaseMixin):
list_field_names = ['composicao', 'parlamentar', 'cargo'] list_field_names = ['composicao', 'parlamentar', 'cargo']
class DetailView(MasterDetailCrud.DetailView):
permission_required = []
class ComposicaoCrud(MasterDetailCrud): class ComposicaoCrud(MasterDetailCrud):
model = Composicao model = Composicao
parent_field = 'comissao' parent_field = 'comissao'
model_set = 'participacao_set' model_set = 'participacao_set'
public = [RP_LIST, RP_DETAIL, ]
class ListView(MasterDetailCrud.ListView):
permission_required = []
class DetailView(MasterDetailCrud.DetailView):
permission_required = []
class ComissaoCrud(Crud): class ComissaoCrud(Crud):
model = Comissao model = Comissao
help_path = 'modulo_comissoes' help_path = 'modulo_comissoes'
public = [RP_LIST, RP_DETAIL, ]
class BaseMixin(Crud.BaseMixin): class BaseMixin(Crud.BaseMixin):
list_field_names = ['nome', 'sigla', 'tipo', 'data_criacao', 'ativa'] list_field_names = ['nome', 'sigla', 'tipo', 'data_criacao', 'ativa']
ordering = '-ativa', 'sigla' ordering = '-ativa', 'sigla'
class ListView(Crud.ListView):
permission_required = []
class DetailView(Crud.DetailView):
permission_required = []
class MateriasTramitacaoListView(ListView): class MateriasTramitacaoListView(ListView):
template_name = "comissoes/materias_em_tramitacao.html" template_name = "comissoes/materias_em_tramitacao.html"

109
sapl/crud/base.py
View File

@ -94,6 +94,7 @@ variáveis do crud:
ordered_list = False desativa os clicks e controles de ord da listagem ordered_list = False desativa os clicks e controles de ord da listagem
parent_field = parentesco reverso separado por '__' parent_field = parentesco reverso separado por '__'
namespace namespace
return_parent_field_url
""" """
@ -978,20 +979,23 @@ class MasterDetailCrud(Crud):
parent_object = getattr(parent_object, field) parent_object = getattr(parent_object, field)
else: else:
parent_object = getattr(self.object, obj.parent_field) parent_object = getattr(self.object, obj.parent_field)
if not isinstance(parent_object, models.Model): if not isinstance(parent_object, models.Model):
if parent_object.count() > 1: if parent_object.count() > 1:
if 'pkk' not in self.request.GET: if 'pkk' not in self.request.GET:
raise Http404 raise Http404()
root_pk = self.request.GET['pkk'] root_pk = self.request.GET['pkk']
parent_object = parent_object.filter(id=root_pk) parent_object = parent_object.filter(id=root_pk)
parent_object = parent_object.first() parent_object = parent_object.first()
if not parent_object: if not parent_object:
raise Http404 raise Http404()
root_pk = parent_object.pk root_pk = parent_object.pk
else: else:
root_pk = self.kwargs['pk'] # in list and create root_pk = self.kwargs['pk'] if 'pkk' not in self.request.GET\
else self.request.GET['pkk']
kwargs.setdefault('root_pk', root_pk) kwargs.setdefault('root_pk', root_pk)
context = super(CrudBaseMixin, self).get_context_data(**kwargs) context = super(CrudBaseMixin, self).get_context_data(**kwargs)
@ -1066,11 +1070,11 @@ class MasterDetailCrud(Crud):
obj = self.crud if hasattr(self, 'crud') else self obj = self.crud if hasattr(self, 'crud') else self
form = super(MasterDetailCrud.CreateView, self).get_form( form = super(MasterDetailCrud.CreateView, self).get_form(
self.form_class) self.form_class)
if not obj.is_m2m: parent_field = obj.parent_field.split('__')
parent_field = obj.parent_field.split('__')[0] if not obj.is_m2m or len(parent_field) > 1:
field = self.model._meta.get_field(parent_field) field = self.model._meta.get_field(parent_field[0])
parent = field.related_model.objects.get(pk=self.kwargs['pk']) parent = field.related_model.objects.get(pk=self.kwargs['pk'])
setattr(form.instance, parent_field, parent) setattr(form.instance, parent_field[0], parent)
return form return form
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
@ -1118,8 +1122,14 @@ class MasterDetailCrud(Crud):
def get_success_url(self): def get_success_url(self):
obj = self.crud if hasattr(self, 'crud') else self obj = self.crud if hasattr(self, 'crud') else self
parent_object = getattr( if '__' in obj.parent_field:
self.get_object(), obj.parent_field) fields = obj.parent_field.split('__')
parent_object = self.object
for field in fields:
parent_object = getattr(parent_object, field)
break
else:
parent_object = getattr(self.object, obj.parent_field)
if not isinstance(parent_object, models.Model): if not isinstance(parent_object, models.Model):
if parent_object.count() > 1: if parent_object.count() > 1:
if 'pkk' not in self.request.GET: if 'pkk' not in self.request.GET:
@ -1134,7 +1144,12 @@ class MasterDetailCrud(Crud):
root_pk = parent_object.pk root_pk = parent_object.pk
pk = root_pk pk = root_pk
return self.resolve_url(ACTION_LIST, args=(pk,))
namespace = parent_object._meta.app_config.name
return reverse('%s:%s' % (
namespace,
'%s_%s' % (parent_object._meta.model_name, ACTION_DETAIL)),
args=(pk,))
class DetailView(Crud.DetailView): class DetailView(Crud.DetailView):
permission_required = RP_DETAIL, permission_required = RP_DETAIL,
@ -1147,6 +1162,10 @@ class MasterDetailCrud(Crud):
@property @property
def detail_list_url(self): def detail_list_url(self):
obj = self.crud if hasattr(self, 'crud') else self obj = self.crud if hasattr(self, 'crud') else self
if not obj.ListView:
return ''
if not obj.ListView.permission_required or\ if not obj.ListView.permission_required or\
self.request.user.has_perm(self.permission(RP_LIST)): self.request.user.has_perm(self.permission(RP_LIST)):
if '__' in obj.parent_field: if '__' in obj.parent_field:
@ -1197,8 +1216,20 @@ class MasterDetailCrud(Crud):
if not parent_object: if not parent_object:
raise Http404 raise Http404
root_pk = parent_object.pk root_pk = parent_object.pk
pk = root_pk
return self.resolve_url(ACTION_CREATE, args=(pk,)) url = self.resolve_url(ACTION_CREATE, args=(root_pk,))
if not obj.is_m2m:
return url
else:
if '__' in obj.parent_field:
fields = obj.parent_field.split('__')
parent_object = self.object
for field in fields:
parent_object = getattr(parent_object, field)
else:
parent_object = getattr(self.object, obj.parent_field)
return url + '?pkk=' + str(parent_object.pk)
else: else:
return '' return ''
@ -1208,29 +1239,59 @@ class MasterDetailCrud(Crud):
if hasattr(obj, 'model_set') and obj.model_set\ if hasattr(obj, 'model_set') and obj.model_set\
and self.request.user.has_perm( and self.request.user.has_perm(
self.permission_set(RP_ADD)): self.permission_set(RP_ADD)):
root_pk = self.object .pk root_pk = self.object.pk
pk = root_pk pk = root_pk
return self.resolve_url_set(ACTION_CREATE, args=(pk,))
url = self.resolve_url_set(ACTION_CREATE, args=(pk,))
if not obj.is_m2m:
return url
else:
if '__' in obj.parent_field:
fields = obj.parent_field.split('__')
parent_object = self.object
for field in fields:
parent_object = getattr(parent_object, field)
else:
parent_object = getattr(self.object, obj.parent_field)
return url + '?pkk=' + str(parent_object.pk)
else: else:
return '' return ''
@property @property
def detail_root_detail_url(self): def detail_root_detail_url(self):
""" obj = self.crud if hasattr(self, 'crud') else self
Implementar retorno para o parent_field imediato no caso de if hasattr(obj, 'parent_field'):
edição em cascata de MasterDetailDetail... parent_field = obj.parent_field.split('__')
""" if not obj.is_m2m or len(parent_field) > 1:
field = self.model._meta.get_field(parent_field[0])
if isinstance(getattr(
self.object, parent_field[0]), models.Model):
parent_object = getattr(self.object, parent_field[0])
root_pk = parent_object.pk
pk = root_pk
namespace = parent_object._meta.app_config.name
return reverse('%s:%s' % (
namespace,
'%s_%s' % (parent_object._meta.model_name,
ACTION_DETAIL)),
args=(pk,))
return '' return ''
@property
def detail_root_detail_verbose_name(self):
obj = self.crud if hasattr(self, 'crud') else self obj = self.crud if hasattr(self, 'crud') else self
if hasattr(obj, 'parent_field'): if hasattr(obj, 'parent_field'):
# parent_field = obj.parent_field.split('__')[0] parent_field = obj.parent_field.split('__')
if not obj.is_m2m or len(parent_field) > 1:
field = self.model._meta.get_field(parent_field[0])
root_pk = self.object .pk return field.verbose_name
pk = root_pk return ''
return self.resolve_url(ACTION_DELETE, args=(pk,))
else:
return ''
@classonlymethod @classonlymethod
def build(cls, model, parent_field, help_path, def build(cls, model, parent_field, help_path,

33
sapl/templates/comissoes/composicao_detail.html
View File

@ -1,33 +0,0 @@
{% extends "crud/detail.html" %}
{% load i18n %}
{% load crispy_forms_tags %}
{% block detail_content %}
<table class="table table-striped">
<thead class="thead-default">
<tr>
<th>Nome</th>
<th>Cargo</th>
<th>Titular</th>
<th>Designação</th>
<th>Desligamento</th>
<th>Motivo</th>
<th>Observação</th>
</tr>
</thead>
{% for participacao in participacoes %}
<tr>
<td><a href="{% url 'sapl.comissoes:participacao_detail' participacao.pk %}">{{participacao.parlamentar.nome_parlamentar}}</a></td>
<td>{{participacao.cargo}}</td>
<td>{{participacao.titular|yesno:"Sim,Não"}}</td>
<td>{{participacao.data_designacao|date:"d/m/Y"}}</td>
<td>{{participacao.data_desligamento|date:"d/m/Y"|default:"-"}}</td>
<td>{{participacao.motivo_desligamento|default:"-"}}</td>
<td>{{participacao.observacao|default:"-"}}</td>
</tr>
{% endfor %}
</table>
{% if user.is_authenticated %}
<a href="{% url 'sapl.comissoes:participacao_create' composicao.pk %}" class="btn btn-primary">Incluir Parlamentar</a>
{% endif %}
{% endblock detail_content %}

3
sapl/templates/crud/detail_detail.html
View File

@ -6,6 +6,9 @@
<div class="context-actions clearfix"> <div class="context-actions clearfix">
{% block actions %} {% block actions %}
<div class="actions btn-group btn-group-sm" role="group"> <div class="actions btn-group btn-group-sm" role="group">
{% if view.detail_root_detail_url %}
<a href="{{ view.detail_root_detail_url }}" class="btn btn-default">{% trans 'Retornar para' %} {{view.detail_root_detail_verbose_name}}</a>
{% endif %}
{% if view.detail_list_url %} {% if view.detail_list_url %}
<a href="{{ view.detail_list_url }}" class="btn btn-default">{% trans 'Listar' %} {{view.verbose_name_plural}}</a> <a href="{{ view.detail_list_url }}" class="btn btn-default">{% trans 'Listar' %} {{view.verbose_name_plural}}</a>
{% endif %} {% endif %}

Write Preview
Loading…
Cancel
Save