diff --git a/wscacicneo/templates/editarorgao.pt b/wscacicneo/templates/editarorgao.pt
index cbb85cd..b9e52aa 100644
--- a/wscacicneo/templates/editarorgao.pt
+++ b/wscacicneo/templates/editarorgao.pt
@@ -72,7 +72,6 @@
$('#sigla').val('')
$('#coleta').val('')
$('#end').val('')
- $('#url').val('')
});
$('#enviar').click(function(){
var nome = $('#nome').val()
diff --git a/wscacicneo/templates/editaruser.pt b/wscacicneo/templates/editaruser.pt
index 1d88ded..1f0ec9d 100644
--- a/wscacicneo/templates/editaruser.pt
+++ b/wscacicneo/templates/editaruser.pt
@@ -59,12 +59,13 @@
@@ -82,18 +83,33 @@
$('#cargo').val('')
$('#setor').val('')
$('#permissao').val('Permissões')
+ $('#senha').val('')
});
$('#enviar').click(function(){
+ var nome = $('#nome').val()
+ matricula = $('#matricula').val()
+ email = $('#email').val()
+ telefone = $('#telefone').val()
+ orgao = $('#orgao').val()
+ cargo = $('#cargo').val()
+ setor = $('#setor').val()
+ permissao = $('#permissao').val()
+ url = $('#url').val()
+ senha = $('#senha').val()
+
var data = {
- 'nome' : $('#nome').val(),
- 'matricula' : $('#matricula').val(),
- 'email' : $('#email').val(),
- 'telefone' : $('#telefone').val(),
- 'orgao' : $('#orgao').val(),
- 'cargo' : $('#cargo').val(),
- 'setor' : $('#setor').val(),
- 'permissao' : $('#permissao').val(),
+ 'url': url,
+ 'nome': nome,
+ 'matricula': matricula,
+ 'email': email,
+ 'telefone': telefone,
+ 'orgao': orgao,
+ 'cargo': cargo,
+ 'setor': setor,
+ 'permissao': permissao,
+ 'senha': senha
}
+
if (data.email.indexOf("gov.br") > -1 == false){
alert('Somente é permitido cadastro de e-mails institucionais');
}else{
diff --git a/wscacicneo/views.py b/wscacicneo/views.py
index c643e72..d4a2f8a 100644
--- a/wscacicneo/views.py
+++ b/wscacicneo/views.py
@@ -338,7 +338,7 @@ def edituser(request):
'cargo' : search.results[0].cargo,
'setor' : search.results[0].setor,
'permissao' : search.results[0].permissao,
- 'senha' : search.results[0].permissao
+ 'senha' : search.results[0].senha
}
@view_config(route_name='put_user')
@@ -362,7 +362,7 @@ def put_user(request):
user = {
'nome' : params['nome'],
'matricula' : params['matricula'],
- 'email' : params['meila'],
+ 'email' : params['email'],
'orgao' : params['orgao'],
'telefone' : params['telefone'],
'cargo' : params['cargo'],
@@ -370,7 +370,7 @@ def put_user(request):
'permissao' : params['permissao'],
'senha' : params['senha']
}
- search = user_obj.search_orgao(matricula)
+ search = user_obj.search_user(matricula)
id = search.results[0]._metadata.id_doc
doc = json.dumps(user)
edit = user_obj.edit_user(id, doc)
--
libgit2 0.21.2