Ajusta comissoes

sapl/comissoes/forms.py

@@ -148,13 +148,15 @@ class ComissaoForm(forms.ModelForm):
 
 class ReuniaoForm(ModelForm):
 
+    comissao = forms.ModelChoiceField(queryset=Comissao.objects.all(),
+                                      widget=forms.HiddenInput())
+
     class Meta:
         model = Reuniao
         exclude = ['cod_andamento_reuniao']
 
     def clean(self):
         super(ReuniaoForm, self).clean()
-        import ipdb; ipdb.set_trace()
 
         if not self.is_valid():
             return self.cleaned_data

sapl/comissoes/views.py

@@ -161,17 +161,8 @@ class ReuniaoCrud(MasterDetailCrud):
 
     class ListView(MasterDetailCrud.ListView):
 
-        template_name = "comissoes/reuniao_list.html"
         paginate_by = None
 
-        def get_context_data(self, **kwargs):
-            context = super().get_context_data(**kwargs)
-            self.reuniao_pk = context['root_pk']
-
-            return context
-
-        def get_rows(self, object_list):
-            for obj in object_list:
 
     class UpdateView(MasterDetailCrud.UpdateView):
         form_class = ReuniaoForm
@@ -184,16 +175,10 @@ class ReuniaoCrud(MasterDetailCrud):
         form_class = ReuniaoForm
 
         def get_initial(self):
-            comissao = Comissao.objects.order_by('data_criacao').first() 
+          comissao = Comissao.objects.get(id=self.kwargs['pk'])
-            if comissao:  
+
-                return {   
+          return {'comissao': comissao}
-                    'comissao': comissao 
+
-                    }  
-            else:  
-                msg = _('Cadastre alguma comissão antes de adicionar '  
-                        'uma reunião!')    
-                messages.add_message(self.request, messagesself.ERROR, msg)    
-                return {}
 
     class DeleteView(MasterDetailCrud.DeleteView, RedirectView):
 

sapl/templates/comissoes/reuniao_list.html

@@ -1,20 +0,0 @@
-{% extends "crud/list.html" %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-{% block detail_content %}
-
- {% if user.is_authenticated and perms.comissoes.add_composicao %}
-  <div class="context-actions clearfix">
-    {% block actions %}
-      <div class="actions btn-group pull-right btn-group-lg" role="group">
-        {% if view.create_url %}
-        <a href="{{ view.create_url }}" class="btn btn-default">
-          {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %}
-        </a>
-        {% endif %}
-        {% block more_buttons %}{% endblock more_buttons %}
-      </div>
-    {% endblock actions %}
-  </div>
- {% endif %}
-{% endblock detail_content %}