Download as
Browse Code »

Commit de9debc5e7efec390690150f23f22a2bbea175df

Authored by Macieski
2 parents 1fee7b4f 7665dce1
Exists in master

Merge branch 'master' of https://github.com/lightbase/WSCacicNeo

Showing 3 changed files with 28 additions and 13 deletions   Show diff stats
wscacicneo/templates/editarorgao.pt
  Diff comments   View file @de9debc
@@ -72,7 +72,6 @@ @@ -72,7 +72,6 @@
72 $('#sigla').val('') 72 $('#sigla').val('')
73 $('#coleta').val('') 73 $('#coleta').val('')
74 $('#end').val('') 74 $('#end').val('')
75 - $('#url').val('')  
76 }); 75 });
77 $('#enviar').click(function(){ 76 $('#enviar').click(function(){
78 var nome = $('#nome').val() 77 var nome = $('#nome').val()
wscacicneo/templates/editaruser.pt
  Diff comments   View file @de9debc
@@ -59,12 +59,13 @@ @@ -59,12 +59,13 @@
59 <div class="form-group"> 59 <div class="form-group">
60 <label class="col-lg-2 control-label">Senha</label> 60 <label class="col-lg-2 control-label">Senha</label>
61 <div class="col-lg-5"> 61 <div class="col-lg-5">
62 - <input type="password" id="senha" class="form-control" placeholder="Informe novamente sua senha"> 62 + <input type="text" id="senha" value="${senha}" class="form-control" placeholder="Informe novamente sua senha">
63 </div> 63 </div>
64 </div> 64 </div>
65 <div class="form-group"> 65 <div class="form-group">
66 <div class="col-lg-offset-2 col-lg-6"> 66 <div class="col-lg-offset-2 col-lg-6">
67 <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button> 67 <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button>
  68 + <input style="display:none;" id="url" value="${request.matchdict['matricula']}">
68 <button type="button" id="limpar" class="btn btn-sm">Limpar</button> 69 <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
69 </div> 70 </div>
70 </div> 71 </div>
@@ -82,18 +83,33 @@ @@ -82,18 +83,33 @@
82 $('#cargo').val('') 83 $('#cargo').val('')
83 $('#setor').val('') 84 $('#setor').val('')
84 $('#permissao').val('Permissões') 85 $('#permissao').val('Permissões')
  86 + $('#senha').val('')
85 }); 87 });
86 $('#enviar').click(function(){ 88 $('#enviar').click(function(){
  89 + var nome = $('#nome').val()
  90 + matricula = $('#matricula').val()
  91 + email = $('#email').val()
  92 + telefone = $('#telefone').val()
  93 + orgao = $('#orgao').val()
  94 + cargo = $('#cargo').val()
  95 + setor = $('#setor').val()
  96 + permissao = $('#permissao').val()
  97 + url = $('#url').val()
  98 + senha = $('#senha').val()
  99 +
87 var data = { 100 var data = {
88 - 'nome' : $('#nome').val(),  
89 - 'matricula' : $('#matricula').val(),  
90 - 'email' : $('#email').val(),  
91 - 'telefone' : $('#telefone').val(),  
92 - 'orgao' : $('#orgao').val(),  
93 - 'cargo' : $('#cargo').val(),  
94 - 'setor' : $('#setor').val(),  
95 - 'permissao' : $('#permissao').val(), 101 + 'url': url,
  102 + 'nome': nome,
  103 + 'matricula': matricula,
  104 + 'email': email,
  105 + 'telefone': telefone,
  106 + 'orgao': orgao,
  107 + 'cargo': cargo,
  108 + 'setor': setor,
  109 + 'permissao': permissao,
  110 + 'senha': senha
96 } 111 }
  112 +
97 if (data.email.indexOf("gov.br") > -1 == false){ 113 if (data.email.indexOf("gov.br") > -1 == false){
98 alert('Somente é permitido cadastro de e-mails institucionais'); 114 alert('Somente é permitido cadastro de e-mails institucionais');
99 }else{ 115 }else{
wscacicneo/views.py
  Diff comments   View file @de9debc
@@ -342,7 +342,7 @@ def edituser(request): @@ -342,7 +342,7 @@ def edituser(request):
342 'cargo' : search.results[0].cargo, 342 'cargo' : search.results[0].cargo,
343 'setor' : search.results[0].setor, 343 'setor' : search.results[0].setor,
344 'permissao' : search.results[0].permissao, 344 'permissao' : search.results[0].permissao,
345 - 'senha' : search.results[0].permissao 345 + 'senha' : search.results[0].senha
346 } 346 }
347 347
348 @view_config(route_name='put_user') 348 @view_config(route_name='put_user')
@@ -366,7 +366,7 @@ def put_user(request): @@ -366,7 +366,7 @@ def put_user(request):
366 user = { 366 user = {
367 'nome' : params['nome'], 367 'nome' : params['nome'],
368 'matricula' : params['matricula'], 368 'matricula' : params['matricula'],
369 - 'email' : params['meila'], 369 + 'email' : params['email'],
370 'orgao' : params['orgao'], 370 'orgao' : params['orgao'],
371 'telefone' : params['telefone'], 371 'telefone' : params['telefone'],
372 'cargo' : params['cargo'], 372 'cargo' : params['cargo'],
@@ -374,7 +374,7 @@ def put_user(request): @@ -374,7 +374,7 @@ def put_user(request):
374 'permissao' : params['permissao'], 374 'permissao' : params['permissao'],
375 'senha' : params['senha'] 375 'senha' : params['senha']
376 } 376 }
377 - search = user_obj.search_orgao(matricula) 377 + search = user_obj.search_user(matricula)
378 id = search.results[0]._metadata.id_doc 378 id = search.results[0]._metadata.id_doc
379 doc = json.dumps(user) 379 doc = json.dumps(user)
380 edit = user_obj.edit_user(id, doc) 380 edit = user_obj.edit_user(id, doc)