Merge branch 'devel' into CC-3174
This commit is contained in:
commit
df33a457b1
31 changed files with 391 additions and 275 deletions
|
@ -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'] = "";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue