Merged revisions 4176-4181 via svnmerge from

svn+ssh://danydb@svn/svn/phpcompta/branches/rel560

........
  r4176 | danydb | 2011-07-05 23:26:47 +0200 (Tue, 05 Jul 2011) | 1 line
  
  add function HtmlInput::button_close
........
  r4177 | danydb | 2011-07-05 23:27:16 +0200 (Tue, 05 Jul 2011) | 1 line
  
  Background transparency 
........
  r4178 | danydb | 2011-07-05 23:27:47 +0200 (Tue, 05 Jul 2011) | 1 line
  
  Fix bug : in parameter > extension all the users are seen
........
  r4179 | danydb | 2011-07-05 23:35:31 +0200 (Tue, 05 Jul 2011) | 2 lines
  
  Bug for 9.0.4: comparison with always true
........
  r4180 | danydb | 2011-07-05 23:39:26 +0200 (Tue, 05 Jul 2011) | 2 lines
  
  fix small bug
........
  r4181 | danydb | 2011-07-10 18:43:22 +0200 (Sun, 10 Jul 2011) | 2 lines
  
  #320 bouton fermer dans popup de fiche
........
This commit is contained in:
Dany De Bontridder 2011-07-10 16:55:01 +00:00
parent 7114f1e56a
commit 4050d4b23b
6 changed files with 18 additions and 13 deletions

View file

@ -692,8 +692,11 @@ class User
{
$sql="select distinct use_id,use_login,use_first_name,use_name from ac_users
left outer join jnt_use_dos using (use_id)
where
(dos_id=$1 or use_admin=1) and use_active=1 order by use_login,use_name";
left join priv_user on (priv_jnt=jnt_id)
where
(dos_id=$1 or use_admin=1) and use_active=1 and (use_admin=1 or priv_priv <> 'X') order by use_login,use_name";
$repo=new Database();
$array=$repo->get_array($sql,array($p_dossier));
if ( $repo->size() == 0 ) throw new Exception ('Error inaccessible folder');