Merge branch 'devel' into CC-3174

This commit is contained in:
Naomi Aro 2012-01-16 09:58:02 +01:00
commit df33a457b1
31 changed files with 391 additions and 275 deletions

View file

@ -241,8 +241,10 @@ class Application_Model_User {
// mark record which is for the current user
foreach($res['aaData'] as &$record){
if($record[1] == $username){
$record[5] = "self";
if($record['login'] == $username){
$record['delete'] = "self";
} else {
$record['delete'] = "";
}
}