Work in progress on roles. Implemented role delete.

[timetracker.git] / WEB-INF / lib / ttTeamHelper.class.php

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 2ae75923fd4be432a368f2efefb7379b3f9031de..3af484c8e83c61ddc3862e156103cb1fea186d14 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -269,7 +269,7 @@ class ttTeamHelper {
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, rights from tt_roles where team_id = $team_id and status = 1 order by upper(name)";
+    $sql = "select id, name, description from tt_roles where team_id = $team_id and status = 1 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -286,8 +286,8 @@ class ttTeamHelper {
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, rights from tt_roles
-      where team_id = $team_id and status = 0 order by upper(name)";
+    $sql = "select id, name, description from tt_roles
+      where team_id = $team_id and status = 0 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {