hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-08 10:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unit tests

Browse Source
This commit is contained in:
Romain Neutron
2013-01-28 19:31:26 +01:00
parent 2fb0c60157
commit aa18c48306
43 changed files with 582 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/classes/User/Query.php
View File

@@ -110,6 +110,12 @@ class User_Query implements User_QueryInterface
*/
protected $only_templates = false;
/**
*
* @var boolean
*/
protected $email_not_null = false;
/**
*
* @var Array
@@ -222,6 +228,10 @@ class User_Query implements User_QueryInterface
$sql .= ' AND usr.invite=0 ';
}
if ( ! $this->email_not_null) {
$sql .= ' AND usr.usr_mail IS NOT NULL ';
}
if ($this->only_templates === true) {
$sql .= ' AND model_of = ' . $this->app['phraseanet.user']->get_id();
} elseif ($this->include_templates === false) {
@@ -439,6 +449,18 @@ class User_Query implements User_QueryInterface
return $this;
}
/**
*
* @param boolean $boolean
* @return User_Query
*/
public function email_not_null($boolean)
{
$this->email_not_null = ! ! $boolean;
return $this;
}
/**
*
* @param array $rights