From 9c91a45ce29ab9586105dbec753cd0dea5c01325 Mon Sep 17 00:00:00 2001
From: Eduardo Santos <eduardo.edusantos@gmail.com>
Date: Wed, 26 Mar 2014 15:43:22 -0300
Subject: [PATCH] Adiciona campos usuário e senha ao servidor de autenticação

---
 .gitignore                                                                      |  1 +
 src/Cacic/CommonBundle/Entity/ServidorAutenticacao.php                          | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/Cacic/CommonBundle/Form/Type/ServidorAutenticacaoType.php                   |  4 +++-
 src/Cacic/CommonBundle/Resources/config/doctrine/ServidorAutenticacao.orm.yml   |  8 ++++++++
 src/Cacic/CommonBundle/Resources/views/ServidorAutenticacao/cadastrar.html.twig |  2 ++
 5 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 465f9fa..356ed94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ web/assetic/
 
 # Ignora htaccess
 .htaccess
+.idea
 
 # Ignora arquivo do importador
 src/Cacic/CommonBundle/Resources/data/importacao.zip
diff --git a/src/Cacic/CommonBundle/Entity/ServidorAutenticacao.php b/src/Cacic/CommonBundle/Entity/ServidorAutenticacao.php
index 53ea9fd..06d5378 100644
--- a/src/Cacic/CommonBundle/Entity/ServidorAutenticacao.php
+++ b/src/Cacic/CommonBundle/Entity/ServidorAutenticacao.php
@@ -444,4 +444,60 @@ class ServidorAutenticacao
     {
         return $this->inAtivo;
     }
+    /**
+     * @var string
+     */
+    private $senha;
+
+
+    /**
+     * Set senha
+     *
+     * @param string $senha
+     * @return ServidorAutenticacao
+     */
+    public function setSenha($senha)
+    {
+        $this->senha = $senha;
+    
+        return $this;
+    }
+
+    /**
+     * Get senha
+     *
+     * @return string 
+     */
+    public function getSenha()
+    {
+        return $this->senha;
+    }
+    /**
+     * @var string
+     */
+    private $usuario;
+
+
+    /**
+     * Set usuario
+     *
+     * @param string $usuario
+     * @return ServidorAutenticacao
+     */
+    public function setUsuario($usuario)
+    {
+        $this->usuario = $usuario;
+    
+        return $this;
+    }
+
+    /**
+     * Get usuario
+     *
+     * @return string 
+     */
+    public function getUsuario()
+    {
+        return $this->usuario;
+    }
 }
\ No newline at end of file
diff --git a/src/Cacic/CommonBundle/Form/Type/ServidorAutenticacaoType.php b/src/Cacic/CommonBundle/Form/Type/ServidorAutenticacaoType.php
index cd3e511..cc72e93 100644
--- a/src/Cacic/CommonBundle/Form/Type/ServidorAutenticacaoType.php
+++ b/src/Cacic/CommonBundle/Form/Type/ServidorAutenticacaoType.php
@@ -41,7 +41,9 @@ class  ServidorAutenticacaoType extends AbstractType
                            'label' => 'Versão'
                        )
         );
-        
+
+        $builder->add('usuario', null, array( 'label'=>'Usuário do LDAP' ));
+        $builder->add('senha', null, array( 'label'=>'Senha do usuário' ));
         $builder->add('teObservacao', null, array( 'label'=>'Observação' ));
         $builder->add('teAtributoIdentificador', null,array('label'=>'Identificador'));
         $builder->add('teAtributoRetornaNome', 'text',array('label'=>'Retorno de Nome Completo'));
diff --git a/src/Cacic/CommonBundle/Resources/config/doctrine/ServidorAutenticacao.orm.yml b/src/Cacic/CommonBundle/Resources/config/doctrine/ServidorAutenticacao.orm.yml
index d080c72..c8e94d2 100644
--- a/src/Cacic/CommonBundle/Resources/config/doctrine/ServidorAutenticacao.orm.yml
+++ b/src/Cacic/CommonBundle/Resources/config/doctrine/ServidorAutenticacao.orm.yml
@@ -85,4 +85,12 @@ Cacic\CommonBundle\Entity\ServidorAutenticacao:
             fixed: true
             nullable: false
             column: in_ativo
+        usuario:
+            type: text
+            nullable: true
+            column: usuario
+        senha:
+            type: text
+            nullable: true
+            column: senha
     lifecycleCallbacks: {  }
diff --git a/src/Cacic/CommonBundle/Resources/views/ServidorAutenticacao/cadastrar.html.twig b/src/Cacic/CommonBundle/Resources/views/ServidorAutenticacao/cadastrar.html.twig
index 62887b9..6688fc3 100644
--- a/src/Cacic/CommonBundle/Resources/views/ServidorAutenticacao/cadastrar.html.twig
+++ b/src/Cacic/CommonBundle/Resources/views/ServidorAutenticacao/cadastrar.html.twig
@@ -48,6 +48,8 @@
                                     {{ form_row(form.idTipoProtocolo, {'form_type': 'horizontal'}) }}
                                     {{ form_row(form.nuVersaoProtocolo, {'form_type': 'horizontal'}) }}
                                     {{ form_row(form.nuPortaServidorAutenticacao, {'form_type': 'horizontal'}) }}
+                                    {{ form_row(form.usuario, {'form_type': 'horizontal'}) }}
+                                    {{ form_row(form.senha, {'form_type': 'horizontal'}) }}
                                     {{ form_row(form.teObservacao, {'form_type': 'horizontal'}) }}
                                     {{ form_row(form.inAtivo, {'form_type': 'horizontal'}) }}
                                 </div>
--
libgit2 0.21.2