From 72f023a07587384c8d18f26c2b4d3cfb026a0f1e Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Mon, 27 Jun 2016 17:37:21 -0300
Subject: [PATCH] =?UTF-8?q?Remove=20c=C3=B3digo=20n=C3=A3o=20usado?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sigi/apps/solicitacoes/forms.py     | 36 ++++++++++-------------------
 sigi/apps/solicitacoes/layouts.yaml | 18 ---------------
 sigi/apps/solicitacoes/views.py     | 14 +----------
 3 files changed, 13 insertions(+), 55 deletions(-)

diff --git a/sigi/apps/solicitacoes/forms.py b/sigi/apps/solicitacoes/forms.py
index a9fe305..781db4e 100644
--- a/sigi/apps/solicitacoes/forms.py
+++ b/sigi/apps/solicitacoes/forms.py
@@ -12,14 +12,14 @@ def open_osticket(solicitacao):
     headers = {'X-API-KEY': OSTICKET_API_KEY,
                'Content-Type': 'application/json'}
 
-    usuario = solicitacao.usuario
     data = {"alert": True,
             "autorespond": True,
             "source": "API",
-            "name": usuario.username,
-            "email": usuario.email,
-            "phone": '-'.join((usuario.primeiro_telefone.ddd,
-                               usuario.primeiro_telefone.numero)),
+            "name": solicitacao.usuario.username,
+            "email": solicitacao.usuario.email,
+            "phone": ' - '.join(
+                (solicitacao.usuario.primeiro_telefone.ddd,
+                 solicitacao.usuario.primeiro_telefone.numero)),
             "subject": solicitacao.titulo,
             "ip": "",
             "message": solicitacao.resumo}
@@ -37,7 +37,7 @@ class SolicitacaoForm(ModelForm):
         max_length=500,
         widget=forms.Textarea)
 
-    class Meta(object):
+    class Meta:
         model = Solicitacao
         fields = [u'codigo', u'usuario', u'sistema',
                   u'email_contato', u'telefone_contato',
@@ -45,9 +45,12 @@ class SolicitacaoForm(ModelForm):
         widgets = {
             u'codigo': forms.HiddenInput(),
             u'usuario': forms.HiddenInput(),
-            u'casa_legislativa': forms.TextInput(attrs={'readonly':'readonly'}),
-            u'email_contato': forms.TextInput(attrs={'readonly':'readonly'}),
-            u'telefone_contato': forms.TextInput(attrs={'readonly':'readonly'})
+            u'casa_legislativa': forms.TextInput(
+                attrs={'readonly': 'readonly'}),
+            u'email_contato': forms.TextInput(
+                attrs={'readonly': 'readonly'}),
+            u'telefone_contato': forms.TextInput(
+                attrs={'readonly': 'readonly'})
         }
 
     @transaction.atomic
@@ -57,18 +60,3 @@ class SolicitacaoForm(ModelForm):
         solicitacao.osticket = os_ticket
         solicitacao.save()
         return solicitacao
-
-
-class SolicitacaoEditForm(ModelForm):
-
-    resumo = forms.CharField(
-        label=u'Resumo',
-        max_length=500,
-        widget=forms.Textarea)
-
-    class Meta(object):
-        model = Solicitacao
-        fields = [u'codigo', u'usuario', u'sistema',
-                  u'casa_legislativa', u'titulo', u'resumo']
-        widgets = {u'codigo': forms.TextInput(attrs={u'readonly': u'readonly'}),
-                   u'usuario': forms.HiddenInput()}
diff --git a/sigi/apps/solicitacoes/layouts.yaml b/sigi/apps/solicitacoes/layouts.yaml
index 2e9804a..cfbf36f 100644
--- a/sigi/apps/solicitacoes/layouts.yaml
+++ b/sigi/apps/solicitacoes/layouts.yaml
@@ -13,21 +13,3 @@ Solicitacao:
     - email_contato telefone_contato
     - titulo
     - resumo
-
-SolicitacaoEdit:
-  Solicitação:
-    - codigo
-    - usuario
-    - sistema
-    - titulo
-    - resumo
-
-SolicitacaoList:
-  Solicitação:
-    - codigo
-    - usuario
-    - sistema
-    - casa_legislativa
-    - email_contato telefone_contato    
-    - titulo
-    - data_criacao
diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py
index ba8729a..95e65dc 100644
--- a/sigi/apps/solicitacoes/views.py
+++ b/sigi/apps/solicitacoes/views.py
@@ -8,7 +8,7 @@ import sigi.apps.crud.base
 from sigi.apps.crud.base import Crud, CrudCreateView, CrudListView, CrudCreateView, CrudUpdateView, CrudBaseMixin
 from sigi.apps.usuarios.models import Usuario
 
-from .forms import SolicitacaoEditForm, SolicitacaoForm
+from .forms import SolicitacaoForm
 from .models import Solicitacao
 
 
@@ -34,18 +34,6 @@ class SolicitacaoCrud(LoginRequiredMixin, Crud):
         def get_success_url(self):
             return reverse(u'solicitacoes:solicitacao_list')
 
-    class UpdateView(LoginRequiredMixin, CrudUpdateView):
-        form_class = SolicitacaoEditForm
-
-        @property
-        def layout_key(self):
-            return u'SolicitacaoEdit'
-
-    class ListView(LoginRequiredMixin, CrudListView):
-        @property
-        def layout_key(self):
-            return u'SolicitacaoList'
-
     class BaseMixin(CrudBaseMixin):
         list_field_names = [u'osticket', u'sistema',
                             u'titulo', u'data_criacao']