Download as
Browse Code »

Commit 91d8441b5aa6df90e5d02a218bfe14a09cdbf3d5

Authored by Edmar Moretti
1 parent a912a9b7
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Correçõ na função de registro de mapfile no banco de administração quando no uso do Postgresql

Showing 8 changed files with 13 additions and 8 deletions   Show diff stats
admin/admin.db
View file @91d8441
No preview for this file type
admin1/catalogo/mapfile/funcoes.php
  Diff comments   View file @91d8441
@@ -410,6 +410,9 @@ function listaUnico($dbhw, $codigo) { @@ -410,6 +410,9 @@ function listaUnico($dbhw, $codigo) {
410 exit (); 410 exit ();
411 } 411 }
412 $titulolegenda = $layer->getmetadata("TEMA"); 412 $titulolegenda = $layer->getmetadata("TEMA");
  413 + if ($convUTF != false) {
  414 + $titulolegenda = utf8_decode ( $titulolegenda );
  415 + }
413 $metaestat = $layer->getmetadata("METAESTAT"); 416 $metaestat = $layer->getmetadata("METAESTAT");
414 $dados = \admin\php\funcoesAdmin\pegaDados ( "SELECT * from ".$esquemaadmin."i3geoadmin_temas WHERE codigo_tema = '$codigo' ", $dbhw, false ); 417 $dados = \admin\php\funcoesAdmin\pegaDados ( "SELECT * from ".$esquemaadmin."i3geoadmin_temas WHERE codigo_tema = '$codigo' ", $dbhw, false );
415 //se nao existir no sistema de admin, faz o registro 418 //se nao existir no sistema de admin, faz o registro
admin1/catalogo/menus/grupos/index.php
  Diff comments   View file @91d8441
@@ -37,7 +37,7 @@ $_SESSION["nome_menu"] = $nome_menu; @@ -37,7 +37,7 @@ $_SESSION["nome_menu"] = $nome_menu;
37 </button> 37 </button>
38 <div class="panel-heading" > 38 <div class="panel-heading" >
39 <small>Menu</small> 39 <small>Menu</small>
40 - <h4><?php echo $nome_menu; ?></h4> 40 + <h4 class="text-info"><?php echo $nome_menu; ?></h4>
41 </div> 41 </div>
42 <blockquote>{{{txtDesc}}}</blockquote> 42 <blockquote>{{{txtDesc}}}</blockquote>
43 43
admin1/catalogo/menus/grupos/subgrupos/index.js
  Diff comments   View file @91d8441
@@ -371,6 +371,7 @@ i3GEOadmin.subgrupos = { @@ -371,6 +371,7 @@ i3GEOadmin.subgrupos = {
371 "onSalvar": "i3GEOadmin.subgrupos.salvarNoDialogo",//funcao 371 "onSalvar": "i3GEOadmin.subgrupos.salvarNoDialogo",//funcao
372 "opcoesPublicado": function(){ 372 "opcoesPublicado": function(){
373 var hash = {}; 373 var hash = {};
  374 +
374 hash[this.publicado + "-sel"] = "selected"; 375 hash[this.publicado + "-sel"] = "selected";
375 hash["sim"] = i3GEOadmin.subgrupos.dicionario.sim; 376 hash["sim"] = i3GEOadmin.subgrupos.dicionario.sim;
376 hash["nao"] = i3GEOadmin.subgrupos.dicionario.nao; 377 hash["nao"] = i3GEOadmin.subgrupos.dicionario.nao;
admin1/catalogo/menus/grupos/subgrupos/index.php
  Diff comments   View file @91d8441
@@ -38,11 +38,11 @@ $nome_menu = $_SESSION[&quot;nome_menu&quot;]; @@ -38,11 +38,11 @@ $nome_menu = $_SESSION[&quot;nome_menu&quot;];
38 </button> 38 </button>
39 <div class="pull-left panel-heading" > 39 <div class="pull-left panel-heading" >
40 <small>Menu</small> 40 <small>Menu</small>
41 - <h4><?php echo $nome_menu; ?></h4> 41 + <h4 class="text-info"><?php echo $nome_menu; ?></h4>
42 </div> 42 </div>
43 <div class="panel-heading"> 43 <div class="panel-heading">
44 <small>Grupo</small> 44 <small>Grupo</small>
45 - <h4><?php echo $nome_grupo; ?></h4> 45 + <h4 class="text-info"><?php echo $nome_grupo; ?></h4>
46 </div> 46 </div>
47 <blockquote>{{{txtDesc}}}</blockquote> 47 <blockquote>{{{txtDesc}}}</blockquote>
48 <div id="ajudaPrincipal" class="modal fade" tabindex="-1"> 48 <div id="ajudaPrincipal" class="modal fade" tabindex="-1">
admin1/catalogo/menus/grupos/subgrupos/temas/index.js
  Diff comments   View file @91d8441
@@ -171,6 +171,7 @@ i3GEOadmin.temas = { @@ -171,6 +171,7 @@ i3GEOadmin.temas = {
171 "onSalvar": "i3GEOadmin.temas.salvarTemaDialogo",//funcao 171 "onSalvar": "i3GEOadmin.temas.salvarTemaDialogo",//funcao
172 "opcoesPublicado": function(){ 172 "opcoesPublicado": function(){
173 var hash = {}; 173 var hash = {};
  174 + hash[this.publicado + "-sel"] = "selected";
174 hash["sim"] = i3GEOadmin.temas.dicionario.sim; 175 hash["sim"] = i3GEOadmin.temas.dicionario.sim;
175 hash["nao"] = i3GEOadmin.temas.dicionario.nao; 176 hash["nao"] = i3GEOadmin.temas.dicionario.nao;
176 return Mustache.to_html( 177 return Mustache.to_html(
admin1/catalogo/menus/grupos/subgrupos/temas/index.php
  Diff comments   View file @91d8441
@@ -38,15 +38,15 @@ $_SESSION[&quot;nome_subgrupo&quot;] = $nome_subgrupo; @@ -38,15 +38,15 @@ $_SESSION[&quot;nome_subgrupo&quot;] = $nome_subgrupo;
38 </button> 38 </button>
39 <div class="pull-left panel-heading" > 39 <div class="pull-left panel-heading" >
40 <small>Menu</small> 40 <small>Menu</small>
41 - <h4><?php echo $nome_menu; ?></h4> 41 + <h4 class="text-info"><?php echo $nome_menu; ?></h4>
42 </div> 42 </div>
43 <div class="pull-left panel-heading"> 43 <div class="pull-left panel-heading">
44 <small>Grupo</small> 44 <small>Grupo</small>
45 - <h4><?php echo $nome_grupo; ?></h4> 45 + <h4 class="text-info"><?php echo $nome_grupo; ?></h4>
46 </div> 46 </div>
47 <div class="panel-heading"> 47 <div class="panel-heading">
48 <small>Subgrupo</small> 48 <small>Subgrupo</small>
49 - <h4><?php echo $nome_subgrupo; ?></h4> 49 + <h4 class="text-info"><?php echo $nome_subgrupo; ?></h4>
50 </div> 50 </div>
51 <blockquote>{{{txtDesc}}}</blockquote> 51 <blockquote>{{{txtDesc}}}</blockquote>
52 <div class="clearfix"></div> 52 <div class="clearfix"></div>
admin1/php/funcoesAdmin.php
  Diff comments   View file @91d8441
@@ -327,8 +327,8 @@ function i3GeoAdminOrdena($pdo,$ordem,$tabela,$colunaid){ @@ -327,8 +327,8 @@ function i3GeoAdminOrdena($pdo,$ordem,$tabela,$colunaid){
327 ); 327 );
328 } 328 }
329 //whitespace + appends included in example for readability 329 //whitespace + appends included in example for readability
330 - $template = "UPDATE '".$esquemaadmin . $tabela."' "  
331 - . " SET 'ordem' = CASE " 330 + $template = "UPDATE ".$esquemaadmin . $tabela." "
  331 + . " SET ordem = CASE "
332 . " %s " 332 . " %s "
333 . " END " 333 . " END "
334 . " WHERE " . $colunaid . " IN (%s);"; 334 . " WHERE " . $colunaid . " IN (%s);";