diff --git a/wscacicneo/templates/editarorgao.pt b/wscacicneo/templates/editarorgao.pt
index bc9e196..c95fa05 100644
--- a/wscacicneo/templates/editarorgao.pt
+++ b/wscacicneo/templates/editarorgao.pt
@@ -7,43 +7,43 @@
                 <div class="form-group">
                   <label class="col-lg-2 control-label">Nome do Órgão</label>
                   <div class="col-lg-5">
-                    <input type="text" id="nome" class="form-control" placeholder="Nome do Órgão">
+                    <input type="text" id="nome" class="form-control" value="${nome}" placeholder="Nome do Órgão">
                   </div>
                 </div>
                 <div class="form-group">
                     <label class="col-lg-2 control-label">Telefone</label>
                         <div class="col-lg-5">
-                        <input type="text" id="telefone"  class="form-control" placeholder="Telefone">
+                        <input type="text" id="telefone" value="${telefone}" class="form-control" placeholder="Telefone">
                   </div>
                 </div>
                 <div class="form-group">
                     <label class="col-lg-2 control-label">Gestor</label>
                         <div class="col-lg-5">
-                        <input type="text" id="gestor" class="form-control" placeholder="Gestor">
+                        <input type="text" id="gestor" value="${cargo}" class="form-control" placeholder="Gestor">
                     </div>
                 </div>
                 <div class="form-group">
                   <label class="col-lg-2 control-label">Sigla</label>
                   <div class="col-lg-5">
-                    <input type="text" id="sigla" class="form-control" placeholder="Sigla">
+                    <input type="text" id="sigla" value="${sigla}" class="form-control" placeholder="Sigla">
                   </div>
                 </div>
                 <div class="form-group">
                     <label class="col-lg-2 control-label">Endereço</label>
                         <div class="col-lg-5">
-                        <input type="text" id="end" class="form-control" placeholder="Endereço">
+                        <input type="text" id="end" value="${endereco}" class="form-control" placeholder="Endereço">
                   </div>
                 </div>
                 <div class="form-group">
                     <label class="col-lg-2 control-label">E-mail</label>
                         <div class="col-lg-5">
-                        <input type="text" id="email" class="form-control" placeholder="E-mail">
+                        <input type="text" id="email" value="${email}" class="form-control" placeholder="E-mail">
                     </div>
                 </div>
                 <div class="form-group">
                   <label class="col-lg-2 control-label">Tempo da Coleta</label>
                   <div class="col-lg-2">
-                    <select id="coleta" class="form-control">
+                    <select id="coleta" value="${coleta}" class="form-control">
                       <option>1 dia</option>
                       <option>2 dias</option>
                       <option>3 dias</option>
@@ -55,6 +55,7 @@
                 <div class="form-group">
                   <div class="col-lg-offset-2 col-lg-6">
                     <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button>
+                    <input style="display:none;" id="url" value="${request.matchdict['orgao']}">
                     <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
                   </div>
                 </div>
@@ -63,6 +64,9 @@
 	</metal:content>
 	<metal:content fill-slot="javascript">
         <script type="text/javascript">
+           $('#limpar').click(function(){
+                alert(url)
+           });
            $('#enviar').click(function(){
                 var nome = $('#nome').val()
                     email = $('#email').val()
@@ -71,8 +75,10 @@
                     sigla = $('#sigla').val()
                     coleta = $('#coleta').val()
                     end = $('#end').val()
+                    url = $('#url').val()
     
                 var data = {
+                    'url': url,
                     'nome': nome,
                     'email': email,
                     'telefone': telefone,
@@ -82,8 +88,8 @@
                     'end': end
                 }
                 $.ajax({
-                    type: "POST",
-                    url: "post_orgao",
+                    type: "PUT",
+                    url: "${request.route_url('root')}post_orgao",
                     data: data, 
                     success: function(){ alert('aaaaaaaaaaaaaaaaaaaaaa')   },
                     error: function(){ alert('ooooooooooooooooooooooooo') },
diff --git a/wscacicneo/templates/orgao.pt b/wscacicneo/templates/orgao.pt
index bc9e196..7bf00ef 100644
--- a/wscacicneo/templates/orgao.pt
+++ b/wscacicneo/templates/orgao.pt
@@ -64,22 +64,14 @@
 	<metal:content fill-slot="javascript">
         <script type="text/javascript">
            $('#enviar').click(function(){
-                var nome = $('#nome').val()
-                    email = $('#email').val()
-                    telefone = $('#telefone').val()
-                    gestor = $('#gestor').val()
-                    sigla = $('#sigla').val()
-                    coleta = $('#coleta').val()
-                    end = $('#end').val()
-    
                 var data = {
-                    'nome': nome,
-                    'email': email,
-                    'telefone': telefone,
-                    'gestor': gestor,
-                    'sigla': sigla,
-                    'coleta': coleta,
-                    'end': end
+                    'nome' : $('#nome').val(),
+                    'email' : $('#email').val(),
+                    'telefone' : $('#telefone').val(),
+                    'gestor' : $('#gestor').val(),
+                    'sigla' : $('#sigla').val(),
+                    'coleta' : $('#coleta').val(),
+                    'end' : $('#end').val(),
                 }
                 $.ajax({
                     type: "POST",
diff --git a/wscacicneo/test/test_orgao_attributes.py b/wscacicneo/test/test_orgao_attributes.py
index fd03aec..5471367 100644
--- a/wscacicneo/test/test_orgao_attributes.py
+++ b/wscacicneo/test/test_orgao_attributes.py
@@ -70,7 +70,7 @@ class TestOrgaoBase(unittest.TestCase):
         orgao_obj = Orgao(
             nome='Ministério do Planejameiaaaaaaaaanto',
             cargo='cargo',
-            coleta='4h',
+            coleta='1 hora',
             sigla='MPOG',
             endereco='Esplanada bloco C',
             email='admin@planemaneto.gov.br',
diff --git a/wscacicneo/views.py b/wscacicneo/views.py
index b379694..9051c37 100644
--- a/wscacicneo/views.py
+++ b/wscacicneo/views.py
@@ -34,7 +34,6 @@ def master(request):
 def root(request):
     return {'project': 'WSCacicNeo'}
 
-
 @view_config(route_name='home', renderer='templates/home.pt')
 def home(request):
     return {'project': 'WSCacicNeo'}
@@ -147,7 +146,26 @@ def configapi(request):
 
 @view_config(route_name='editorgao', renderer='templates/editarorgao.pt')
 def editorgao(request):
-    return {'project': 'WSCacicNeo'}
+    nm_orgao = request.matchdict['orgao']
+    orgao_obj = Orgao(
+        nome = nm_orgao,
+        cargo = 'cargo',
+        coleta = '4h',
+        sigla = 'MPOG',
+        endereco = 'Esplanada bloco C',
+        email = 'admin@planemaneto.gov.br',
+        telefone = '(61) 2025-4117'
+    )
+    search = orgao_obj.search_orgao(nm_orgao)
+    return {
+        'nome' : search.results[0].nome,
+        'cargo' : search.results[0].cargo,
+        'coleta' : search.results[0].coleta,
+        'sigla' : search.results[0].sigla,
+        'endereco' : search.results[0].endereco,
+        'email' : search.results[0].email,
+        'telefone' : search.results[0].telefone
+    }
 
 @view_config(route_name='notify', renderer='templates/notify.pt')
 def notify(request):
@@ -209,7 +227,7 @@ def put_orgao(request):
     Edita um doc apartir do id
     """
     doc = request.params
-    nm_orgao = doc['nome']
+    nm_orgao = doc['url']
     orgao_obj = Orgao(
         nome = doc['nome'],
         cargo = doc['gestor'],
--
libgit2 0.21.2