Browse Source

Teste redirect login

pull/6/head
Eduardo Edson Batista Cordeiro Alves 9 years ago
committed by Luciano Almeida
parent
commit
8a51e8d284
  1. 2
      sigi/apps/crispy_layout_mixin.py
  2. 5
      sigi/apps/usuarios/views.py
  3. 2
      sigi/settings/base.py
  4. 2
      sigi/urls.py
  5. 4
      templates/base.html
  6. 12
      templates/index_atendimento.html

2
sigi/apps/crispy_layout_mixin.py

@ -64,7 +64,7 @@ def get_field_display(obj, fieldname):
elif 'date' in str(type(value)): elif 'date' in str(type(value)):
display = formats.date_format(value, "SHORT_DATE_FORMAT") display = formats.date_format(value, "SHORT_DATE_FORMAT")
elif 'bool' in str(type(value)): elif 'bool' in str(type(value)):
display = _('Sim') if value else _('Não') display = _(u'Sim') if value else _(u'Não')
elif 'ImageFieldFile' in str(type(value)): elif 'ImageFieldFile' in str(type(value)):
if value: if value:
display = '<img src="{}" />'.format(value.url) display = '<img src="{}" />'.format(value.url)

5
sigi/apps/usuarios/views.py

@ -18,6 +18,8 @@ from sigi.apps.crud.base import (Crud, CrudBaseMixin, CrudCreateView,
from .forms import (HabilitarEditForm, MudarSenhaForm, UsuarioEditForm, from .forms import (HabilitarEditForm, MudarSenhaForm, UsuarioEditForm,
UsuarioForm) UsuarioForm)
from .models import Usuario, ConfirmaEmail, User from .models import Usuario, ConfirmaEmail, User
from django.contrib.auth.decorators import login_required
from django.shortcuts import redirect
class UsuarioCrud(Crud): class UsuarioCrud(Crud):
@ -53,7 +55,7 @@ class UsuarioCrud(Crud):
settings.EMAIL_HOST_USER] settings.EMAIL_HOST_USER]
send_mail(assunto, mensagem, remetente, destinatario, send_mail(assunto, mensagem, remetente, destinatario,
fail_silently=False) fail_silently=False)
return reverse(u'home') return reverse(u'home_atendimento')
class ListView(LoginRequiredMixin, CrudListView): class ListView(LoginRequiredMixin, CrudListView):
pass pass
@ -87,7 +89,6 @@ class UsuarioCrud(Crud):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(DetailView, self).get_context_data(**kwargs) context = super(DetailView, self).get_context_data(**kwargs)
tel1 = context[u'object'].primeiro_telefone tel1 = context[u'object'].primeiro_telefone
tel1 = [(u'Primeiro Telefone'), tel1 = [(u'Primeiro Telefone'),
(u'[%s] - %s' % (tel1.ddd, tel1.numero))] (u'[%s] - %s' % (tel1.ddd, tel1.numero))]

2
sigi/settings/base.py

@ -142,7 +142,7 @@ MEDIA_URL = '/media/'
SESSION_EXPIRE_AT_BROWSER_CLOSE = True SESSION_EXPIRE_AT_BROWSER_CLOSE = True
LOGIN_REDIRECT_URL = '/' LOGIN_REDIRECT_URL = ''
LOGIN_URL = '/login/' LOGIN_URL = '/login/'
# Using pytest directly (without a test runner) # Using pytest directly (without a test runner)

2
sigi/urls.py

@ -1,4 +1,5 @@
#-*- coding:utf-8 -*- #-*- coding:utf-8 -*-
from django.conf import settings from django.conf import settings
from django.conf.urls import patterns, include, url from django.conf.urls import patterns, include, url
from django.conf.urls.static import static from django.conf.urls.static import static
@ -7,7 +8,6 @@ from django.views.generic.base import TemplateView
from sigi.apps.saberes.views import pentaho_proxy from sigi.apps.saberes.views import pentaho_proxy
admin.site.index_template = 'index.html' admin.site.index_template = 'index.html'
admin.autodiscover() admin.autodiscover()

4
templates/base.html

@ -36,8 +36,8 @@
</ul> </ul>
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li><a href="{% url 'servicos:solicitacao_list' %}">Solicitação</a></li> <li><a href="{% url 'solicitacoes:solicitacao_list' %}">Solicitação</a></li>
<li><a href="{% url 'servicos:sistema_list' %}">Sistema</a></li> <li><a href="{% url 'solicitacoes:sistema_list' %}">Sistema</a></li>
<li><a href="{% url 'usuarios:usuario_list' %}">Habilitar</a></li> <li><a href="{% url 'usuarios:usuario_list' %}">Habilitar</a></li>
{% endif %} {% endif %}
</ul> </ul>

12
templates/index_atendimento.html

@ -0,0 +1,12 @@
{% extends "base.html" %}
{% load i18n %}
{% block title %}
<h1 class="page-header">Bem-vindo ao Centro de Suporte</h1>
{% endblock %}
{% block base_content %}
Através deste sistema, você poderá solicitar novos serviços a serem
hospedados em nosso Data Center e acompanhar as solicitações já em aberto.
Cadastre-se para continuar.
{% endblock %}
Loading…
Cancel
Save