Browse Source

Inicia resolução

pull/1313/head
Eduardo Calil 9 years ago
parent
commit
337c6ebd92
  1. 5
      sapl/base/urls.py
  2. 10
      sapl/base/views.py
  3. 2
      sapl/settings.py

5
sapl/base/urls.py

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

10
sapl/base/views.py

@ -14,6 +14,8 @@ from django.utils.translation import ugettext_lazy as _
from django.views.generic.base import TemplateView from django.views.generic.base import TemplateView
from django_filters.views import FilterView from django_filters.views import FilterView
from haystack.views import SearchView
from sapl.base.forms import AutorForm, AutorFormForAdmin, TipoAutorForm from sapl.base.forms import AutorForm, AutorFormForAdmin, TipoAutorForm
from sapl.base.models import Autor, TipoAutor from sapl.base.models import Autor, TipoAutor
from sapl.crud.base import CrudAux from sapl.crud.base import CrudAux
@ -454,3 +456,11 @@ class AppConfigCrud(CrudAux):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
return HttpResponseRedirect(reverse('sapl.base:appconfig_create')) return HttpResponseRedirect(reverse('sapl.base:appconfig_create'))
class SearchView(SearchView):
results_per_page = 1
def get_results(self):
x = super(SearchView, self).get_results()
import ipdb; ipdb.set_trace()
return x

2
sapl/settings.py

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

Loading…
Cancel
Save