Merge branch 'master' into 1302-restringir-tipo-pesq-textual

sapl/base/urls.py

@@ -17,7 +17,7 @@ from .views import (AppConfigCrud, CasaLegislativaCrud, HelpView,
                     RelatorioMateriasPorAutorView,
                     RelatorioMateriasTramitacaoView,
                     RelatorioPresencaSessaoView,
-                    SearchView)
+                    SaplSearchView)
 
 app_name = AppConfig.name
 
@@ -101,6 +101,6 @@ urlpatterns = [
         name='login'),
     url(r'^logout/$', views.logout, {'next_page': '/login'}, name='logout'),
 
-    url(r'^sistema/search/', SearchView(), name='search_view'),
+    url(r'^sistema/search/', SaplSearchView(), name='search_view'),
 
 ] + recuperar_senha

sapl/base/views.py

@@ -458,11 +458,11 @@ class AppConfigCrud(CrudAux):
             return HttpResponseRedirect(reverse('sapl.base:appconfig_create'))
 
 
-class SearchView(SearchView):
-    results_per_page = 1
+class SaplSearchView(SearchView):
+    results_per_page = 10
 
     def get_context(self):
-        context = super(SearchView, self).get_context()
+        context = super(SaplSearchView, self).get_context()
 
         if 'models' in self.request.GET:
             models = self.request.GET.getlist('models')

sapl/materia/views.py

@@ -958,6 +958,12 @@ class TramitacaoCrud(MasterDetailCrud):
         def form_valid(self, form):
             self.object = form.save()
 
+            if form.instance.status.indicador == 'F':
+                form.instance.materia.em_tramitacao = False
+            else:
+                form.instance.materia.em_tramitacao = True
+            form.instance.materia.save()
+
             try:
                 tramitacao_signal.send(sender=Tramitacao,
                                        post=self.object,
@@ -981,6 +987,12 @@ class TramitacaoCrud(MasterDetailCrud):
         def form_valid(self, form):
             self.object = form.save()
 
+            if form.instance.status.indicador == 'F':
+                form.instance.materia.em_tramitacao = False
+            else:
+                form.instance.materia.em_tramitacao = True
+            form.instance.materia.save()
+
             try:
                 tramitacao_signal.send(sender=Tramitacao,
                                        post=self.object,

sapl/settings.py

@@ -205,8 +205,8 @@ LANGUAGES = (
 
 TIME_ZONE = 'America/Sao_Paulo'
 USE_I18N = True
-USE_L10N = False
-USE_TZ = True
+USE_L10N = True
+USE_TZ = False
 # DATE_FORMAT = 'N j, Y'
 DATE_FORMAT = 'd/m/Y'
 SHORT_DATE_FORMAT = 'd/m/Y'