Commit e118eb858984e80aa7afd25a876c4b84b1cf4b1b

Authored by Edmar Moretti
1 parent 5e513924

Correção de erros no sistema de administração. Remoção do ícone de preview da árvore de temas

admin/admin.db
No preview for this file type
admin1/catalogo/index.js
  1 +/*
1 $('#previewArvore').on('show.bs.modal', function (event) { 2 $('#previewArvore').on('show.bs.modal', function (event) {
2 var modal = $(this); 3 var modal = $(this);
3 var texto = '<iframe src="' + i3GEO.configura.locaplic + '/admin1/catalogo/preview.htm" frameborder="0" scrolling="yes" height="2000px" width="100%"></iframe>'; 4 var texto = '<iframe src="' + i3GEO.configura.locaplic + '/admin1/catalogo/preview.htm" frameborder="0" scrolling="yes" height="2000px" width="100%"></iframe>';
4 modal.find('.modal-body').html(texto); 5 modal.find('.modal-body').html(texto);
5 -});  
6 \ No newline at end of file 6 \ No newline at end of file
  7 +});
  8 +*/
7 \ No newline at end of file 9 \ No newline at end of file
admin1/catalogo/menus/grupos/index.php
@@ -26,10 +26,6 @@ $_SESSION[&quot;nome_menu&quot;] = $nome_menu; @@ -26,10 +26,6 @@ $_SESSION[&quot;nome_menu&quot;] = $nome_menu;
26 <div class="row center-block"> 26 <div class="row center-block">
27 <div class="col-md-12"> 27 <div class="col-md-12">
28 <div class="well hidden"> 28 <div class="well hidden">
29 - <button data-toggle="modal" data-target="#previewArvore"  
30 - class="btn btn-primary btn-fab btn-fab-mini pull-right" style="left:10px">  
31 - <i class="material-icons">visibility</i>  
32 - </button>  
33 <button data-toggle="modal" data-target="#ajudaPrincipal" 29 <button data-toggle="modal" data-target="#ajudaPrincipal"
34 class="btn btn-primary btn-fab btn-fab-mini pull-right"> 30 class="btn btn-primary btn-fab btn-fab-mini pull-right">
35 <i class="material-icons">help</i> 31 <i class="material-icons">help</i>
admin1/catalogo/menus/grupos/listadegrupos/exec.php
@@ -37,7 +37,7 @@ $id_grupo = $_POST[&quot;id_grupo&quot;]; @@ -37,7 +37,7 @@ $id_grupo = $_POST[&quot;id_grupo&quot;];
37 $funcao = strtoupper ( $funcao ); 37 $funcao = strtoupper ( $funcao );
38 switch ($funcao) { 38 switch ($funcao) {
39 case "ADICIONAR" : 39 case "ADICIONAR" :
40 - $novo = adicionar( $_POST["nome_grupo"], $_POST["desc_grupo"], $_POST["en"], $_POST["es"], $dbhw ); 40 + $novo = \admin\catalogo\menus\grupos\listadegrupos\adicionar( $_POST["nome_grupo"], $_POST["desc_grupo"], $_POST["en"], $_POST["es"], $dbhw );
41 if ($novo === false) { 41 if ($novo === false) {
42 $dbhw = null; 42 $dbhw = null;
43 $dbh = null; 43 $dbh = null;
admin1/catalogo/menus/grupos/listadegrupos/funcoes.php
@@ -18,7 +18,7 @@ function adicionar($nome_grupo, $desc_grupo, $en, $es, $dbhw) { @@ -18,7 +18,7 @@ function adicionar($nome_grupo, $desc_grupo, $en, $es, $dbhw) {
18 $esquemaadmin = $_SESSION["esquemaadmin"]; 18 $esquemaadmin = $_SESSION["esquemaadmin"];
19 try { 19 try {
20 $dataCol = array( 20 $dataCol = array(
21 - "nome_grupo" => $nome_grupo, 21 + "nome_grupo" => "",
22 "desc_grupo" => "", 22 "desc_grupo" => "",
23 "en" => "", 23 "en" => "",
24 "es" => "", 24 "es" => "",
@@ -63,6 +63,7 @@ function excluir($id_grupo, $dbhw) { @@ -63,6 +63,7 @@ function excluir($id_grupo, $dbhw) {
63 if ($resultado === false) { 63 if ($resultado === false) {
64 return false; 64 return false;
65 } 65 }
  66 + return $resultado;
66 } 67 }
67 } 68 }
68 ?> 69 ?>
69 \ No newline at end of file 70 \ No newline at end of file
admin1/catalogo/menus/grupos/listadegrupos/index.js
@@ -182,8 +182,9 @@ Obt&amp;eacute;m a lista de grupos @@ -182,8 +182,9 @@ Obt&amp;eacute;m a lista de grupos
182 .done( 182 .done(
183 function(data, status){ 183 function(data, status){
184 i3GEOadmin.core.modalAguarde(false); 184 i3GEOadmin.core.modalAguarde(false);
185 - var json = jQuery.parseJSON(data)*1;  
186 - $("#form-" + json).remove(); 185 + i3GEOadmin.grupos.lista();
  186 + //var json = jQuery.parseJSON(data)*1;
  187 + //$("#form-" + json).remove();
187 } 188 }
188 ) 189 )
189 .fail( 190 .fail(
admin1/catalogo/menus/grupos/subgrupos/index.php
@@ -27,11 +27,6 @@ $nome_menu = $_SESSION[&quot;nome_menu&quot;]; @@ -27,11 +27,6 @@ $nome_menu = $_SESSION[&quot;nome_menu&quot;];
27 <div class="row center-block"> 27 <div class="row center-block">
28 <div class="col-md-12"> 28 <div class="col-md-12">
29 <div class="well hidden"> 29 <div class="well hidden">
30 - <button data-toggle="modal" data-target="#previewArvore"  
31 - class="btn btn-primary btn-fab btn-fab-mini pull-right" style="left:10px">  
32 - <i class="material-icons">visibility</i>  
33 - </button>  
34 -  
35 <button data-toggle="modal" data-target="#ajudaPrincipal" 30 <button data-toggle="modal" data-target="#ajudaPrincipal"
36 class="btn btn-primary btn-fab btn-fab-mini pull-right"> 31 class="btn btn-primary btn-fab btn-fab-mini pull-right">
37 <i class="material-icons">help</i> 32 <i class="material-icons">help</i>
admin1/catalogo/menus/grupos/subgrupos/temas/index.php
@@ -31,10 +31,6 @@ $_SESSION[&quot;nome_subgrupo&quot;] = $nome_subgrupo; @@ -31,10 +31,6 @@ $_SESSION[&quot;nome_subgrupo&quot;] = $nome_subgrupo;
31 <div class="row center-block"> 31 <div class="row center-block">
32 <div class="col-md-12"> 32 <div class="col-md-12">
33 <div class="well hidden"> 33 <div class="well hidden">
34 - <button data-toggle="modal" data-target="#previewArvore"  
35 - class="btn btn-primary btn-fab btn-fab-mini pull-right" style="left:10px">  
36 - <i class="material-icons">visibility</i>  
37 - </button>  
38 <span class="pull-right">&nbsp;&nbsp;</span> 34 <span class="pull-right">&nbsp;&nbsp;</span>
39 <button data-toggle="modal" data-target="#modalFiltro" 35 <button data-toggle="modal" data-target="#modalFiltro"
40 class="btn btn-primary btn-fab btn-fab-mini pull-right"> 36 class="btn btn-primary btn-fab btn-fab-mini pull-right">
admin1/catalogo/menus/index.php
@@ -17,10 +17,6 @@ include &quot;../../head.php&quot;; @@ -17,10 +17,6 @@ include &quot;../../head.php&quot;;
17 <div class="row center-block"> 17 <div class="row center-block">
18 <div class="col-md-12" id="titulo"> 18 <div class="col-md-12" id="titulo">
19 <div class="well hidden" > 19 <div class="well hidden" >
20 - <button title="preview" data-toggle="modal" data-target="#previewArvore"  
21 - class="btn btn-primary btn-fab btn-fab-mini pull-right" style="left:10px">  
22 - <i class="material-icons">visibility</i>  
23 - </button>  
24 <button data-toggle="modal" data-target="#ajudaPrincipal" 20 <button data-toggle="modal" data-target="#ajudaPrincipal"
25 class="btn btn-primary btn-fab btn-fab-mini pull-right"> 21 class="btn btn-primary btn-fab btn-fab-mini pull-right">
26 <i class="material-icons">help</i> 22 <i class="material-icons">help</i>