diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php index 13bc7936f3e..508aeeb1212 100644 --- a/application/controllers/admin/participantsaction.php +++ b/application/controllers/admin/participantsaction.php @@ -810,9 +810,12 @@ function getParticipants_json($search = null) // Super admin $sCanEdit = "true"; } + if (trim($row['ownername'])=='') { + $row['ownername']=$row['username']; + } $aRowToAdd['cell'] = array($row['participant_id'], $sCanEdit, $row['firstname'], $row['lastname'], $row['email'], $row['blacklisted'], $row['survey'], $row['language'], $row['ownername']); $aRowToAdd['id'] = $row['participant_id']; - unset($row['participant_id'], $row['firstname'], $row['lastname'], $row['email'], $row['blacklisted'], $row['language'],$row['ownername'],$row['owner_uid'], $row['can_edit']); + unset($row['participant_id'], $row['firstname'], $row['lastname'], $row['email'], $row['blacklisted'], $row['language'],$row['ownername'],$row['owner_uid'], $row['can_edit'], $row['survey'], $row['username']); foreach($row as $key=>$attvalue) { $aRowToAdd['cell'][] = $attvalue; diff --git a/application/models/Participants.php b/application/models/Participants.php index 2c276ffcbe4..ac4a6787203 100644 --- a/application/models/Participants.php +++ b/application/models/Participants.php @@ -266,6 +266,8 @@ private function getParticipantsSelectCommand($count = false, $attid, $search = $selectValue[] = "p.*"; $selectValue[] = "luser.full_name as ownername"; + $selectValue[] = "luser.users_name as username"; + // Add survey count subquery $subQuery = Yii::app()->db->createCommand()