From 1c41008e936558caab38c91ce2062aaec7e571b6 Mon Sep 17 00:00:00 2001
From: LeandroRoberto <leandroroberto.br@gmail.com>
Date: Wed, 12 Oct 2016 14:01:17 -0300
Subject: [PATCH] Alt backend de perm e pag de drf e ref layout topo

---
 sapl/base/forms.py | 13 +++++++++++++
 sapl/settings.py   |  2 --
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/sapl/base/forms.py b/sapl/base/forms.py
index 01c05d1d6..ccbc7d496 100644
--- a/sapl/base/forms.py
+++ b/sapl/base/forms.py
@@ -16,6 +16,7 @@ from django.core.exceptions import ValidationError
 from django.db import models, transaction
 from django.forms import ModelForm
 from django.utils.translation import ugettext_lazy as _, string_concat
+
 import django_filters
 
 from sapl.base.models import Autor, TipoAutor
@@ -30,6 +31,7 @@ from sapl.utils import (RANGE_ANOS, ImageThumbnailFileInput,
 
 from .models import AppConfig, CasaLegislativa
 
+
 ACTION_CREATE_USERS_AUTOR_CHOICE = [
     ('C', _('Criar novo Usuário')),
     ('A', _('Associar um usuário existente')),
@@ -190,15 +192,26 @@ class AutorForm(ModelForm):
                 StrictButton(
                     _('Filtrar'), css_class='btn-default btn-filtrar-autor',
                     type='button')),
+<<<<<<< 2a44eb455a5caa1a6edb588021e46fb34b1160e7
+=======
+
+
+>>>>>>> Alt backend de perm e pag de drf e ref layout topo
             css_class='hidden',
             data_action='create',
             data_application='AutorSearch',
             data_field='autor_related')
 
+<<<<<<< 2a44eb455a5caa1a6edb588021e46fb34b1160e7
         autor_select = Row(to_column(('tipo', 3)),
                            Div(to_column(('nome', 5)),
                                to_column(('cargo', 4)), css_class="div_nome_cargo"),
                            to_column((autor_related, 9)),
+=======
+        autor_select = Row(to_column(('tipo', 4)),
+                           to_column(('nome', 8)),
+                           to_column((autor_related, 8)),
+>>>>>>> Alt backend de perm e pag de drf e ref layout topo
                            to_column((Div(
                                Field('autor_related'),
                                css_class='radiogroup-autor-related hidden'),
diff --git a/sapl/settings.py b/sapl/settings.py
index f3030d255..608fa71d8 100644
--- a/sapl/settings.py
+++ b/sapl/settings.py
@@ -105,8 +105,6 @@ REST_FRAMEWORK = {
     ),
     "DEFAULT_PERMISSION_CLASSES": (
         "rest_framework.permissions.IsAuthenticated",
-    ),
-    "DEFAULT_PERMISSION_CLASSES": (
         "sapl.api.permissions.DjangoModelPermissions",
     ),
     "DEFAULT_AUTHENTICATION_CLASSES": (