diff options
| author | JulienMoumne <julien@piwik.org> | 2011-03-06 16:56:25 +0300 |
|---|---|---|
| committer | JulienMoumne <julien@piwik.org> | 2011-03-06 16:56:25 +0300 |
| commit | 8102cc9a67f5a3be6f4edb56638413416fd0819d (patch) | |
| tree | 13a2573fa46fc696dee7204d3d4a1e869cbd834a /plugins/UsersManager | |
| parent | b71dec8c897f64f2f68474e009473216cbcf7b0a (diff) | |
fixes #2151 - ordering getUsersSitesFromAccess() SQL query, updating unit tests, should all API queries have an order by clause ?
git-svn-id: http://dev.piwik.org/svn/trunk@4039 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/UsersManager')
| -rw-r--r-- | plugins/UsersManager/API.php | 3 | ||||
| -rw-r--r-- | plugins/UsersManager/tests/UsersManager.test.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index dfb46816de..a9f3455ab2 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -143,7 +143,8 @@ class Piwik_UsersManager_API $db = Zend_Registry::get('db'); $users = $db->fetchAll("SELECT login,idsite FROM ".Piwik_Common::prefixTable("access") - ." WHERE access = ?", $access); + ." WHERE access = ? + ORDER BY login, idsite", $access); $return = array(); foreach($users as $user) { diff --git a/plugins/UsersManager/tests/UsersManager.test.php b/plugins/UsersManager/tests/UsersManager.test.php index ce772b2cee..8641c08a79 100644 --- a/plugins/UsersManager/tests/UsersManager.test.php +++ b/plugins/UsersManager/tests/UsersManager.test.php @@ -770,7 +770,7 @@ class Test_Piwik_UsersManager extends Test_Database $access1 = Piwik_UsersManager_API::getInstance()->getUsersSitesFromAccess('view'); $access2 = Piwik_UsersManager_API::getInstance()->getUsersSitesFromAccess('admin'); - $wanted1 = array( 'user1' => array($id1,$id2), 'user2' => array($id3, $id2) ); + $wanted1 = array( 'user1' => array($id1,$id2), 'user2' => array($id2, $id3) ); $wanted2 = array( 'user2' => array($id1) ); $this->assertEqual($access1, $wanted1); |