Correcoes na tabela de filas com filtro de organizacao nas querys e correcao de nomes de filas.

admin/cadQgrupos.php

@@ -414,7 +414,7 @@
                             <td>
                                 <fieldset>
                                     <legend class="labels">Nome:</legend>
-                                    <input name="nome" type="text" class="validate[required,length[0,100]] caixas" id="nome2" value="<?= ($acao == 'edita') ?  GravaNomeOrganizacao($nome) . '"' . 'disabled="disabled' : null; ?>" />
+                                    <input name="nome" type="text" class="validate[required,length[0,100]] caixas" id="nome2" value="<?= ($acao == 'edita') ? $nome . '"' . 'disabled="disabled' : null; ?>" />
                                 </fieldset>
                             </td>
                             <td>

admin/queues.php

@@ -124,8 +124,22 @@ if ($acao == "deleta") {
                             ELSE FALSE
                         END AS is_admin
                 )
-                SELECT DISTINCT ON (a.id)
+                        SELECT
-                    a.id,
+                        distinct ON(a.id) a.id,
+                        a.nome,
+                        a.numero,
+                        a.strategy,
+                        a.timeout2,
+                        a.status
+                    FROM
+                        pbx_queues_grupos a
+                    WHERE
+                        (SELECT is_admin FROM admin_check) = TRUE $statuSql $compl
+
+                    UNION 
+
+                    SELECT
+                    distinct ON(a.id) a.id,
                         a.nome,
                         a.numero,
                         a.strategy,
@@ -134,10 +148,10 @@ if ($acao == "deleta") {
                     FROM
                         pbx_queues_grupos a
                 INNER JOIN pbx_fila_grupos pfg ON
-                    ((SELECT is_admin FROM admin_check) OR pfg.id = a.id)
+                    ((SELECT is_admin FROM admin_check) = TRUE OR pfg.id = a.id)
                     AND pfg.org_id = a.org_id
                 INNER JOIN pbx_grupo_usuario pgu ON
-                    ((SELECT is_admin FROM admin_check) OR pgu.gp_id = pfg.gp_id)
+                    ((SELECT is_admin FROM admin_check) = TRUE OR pgu.gp_id = pfg.gp_id)
                     AND pgu.org_id = pfg.org_id
                 INNER JOIN pbx_usuarios pu ON
                     ((pu.id = pgu.user_id AND pu.matricula = '$matricula') OR (SELECT is_admin FROM admin_check))
@@ -184,7 +198,7 @@ if ($acao == "deleta") {
                             <table width="100%" border="0" cellspacing="0" cellpadding="2" style="border:0;">
                                 <tr style="border:0;">
                                     <td style="border:0;">
-                                        <div align="center"><a href="#" title="Editar Fila: <?php echo $dados['nome']; ?>" onclick="abre_janela('780', '560.', 'index.php?idProg=11002&pbxRequest=1&acao=edita&id=<?php echo $dados['id']; ?><?= $params; ?>');"><img src="admin/images/edit.gif" alt="EDITAR A FILA:<?php echo $dados['nome']; ?>" width="16" height="16" border="0"></a></div>
+                                        <div align="center"><a href="#" title="Editar Fila: <?php echo RemoveExibicaoOrg($dados['nome']); ?>" onclick="abre_janela('780', '560.', 'index.php?idProg=11002&pbxRequest=1&acao=edita&id=<?php echo $dados['id']; ?><?= $params; ?>');"><img src="admin/images/edit.gif" alt="EDITAR A FILA:<?php echo $dados['nome']; ?>" width="16" height="16" border="0"></a></div>
                                     </td>
 
                                     <?php if (!$totaldep) { ?>

include/util/funcoesApl.php

@@ -1337,7 +1337,7 @@ function GetOrganizacao() {
             INNER JOIN pbx_organizacao_usuarios pou ON po.id = pou.id_organizacao 
             INNER JOIN pbx_usuarios pu ON pu.id = pou.id_usuario 
             WHERE id_usuario = %s
-            AND (org_padrao = po.id OR po.id = (SELECT MIN(id_organizacao) FROM pbx_organizacao_usuarios WHERE id_usuario = pu.id AND po.status='1'))";
+            AND po.id = (SELECT MIN(id_organizacao) FROM pbx_organizacao_usuarios WHERE id_usuario = pu.id AND po.status='1')";
         $query = sprintf($query, $_SESSION['SSidUser']);
         $result = pg_query($dbcon, $query);
         $res = pg_fetch_assoc($result);

projeto/base/sql/versao-1.9.0.sql

@@ -231,7 +231,7 @@ ALTER TABLE pbx_sip_ramais
 	ADD COLUMN registro varchar(100);
 
 ALTER TABLE pbx_queues_grupos 
-	ADD COLUMN numero_asterisk varchar(25)
+	ADD COLUMN numero_asterisk varchar(25);
 
 ALTER TABLE pbx_queues_grupos 
-	ADD COLUMN nome_asterisk varchar(105)
+	ADD COLUMN nome_asterisk varchar(105);