Fixed issue #7014: "R" entry in User control Page

LimeSurvey · Dec 5, 2012 · a40d6b1 · a40d6b1
1 parent bb6994a
commit a40d6b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -1336,7 +1336,10 @@ function getUserList($outputformat='fullinfoarray')
                     )
                 )
             UNION
-            SELECT {$sSelectFields} from {{users}} v where v.parent_id={$myuid}";
+            SELECT {$sSelectFields} from {{users}} v where v.parent_id={$myuid}
+            UNION
+            SELECT {$sSelectFields} from {{users}} v where uid={$myuid}";
+
         }
         else
         {

diff --git a/application/views/admin/user/editusers.php b/application/views/admin/user/editusers.php
@@ -102,7 +102,9 @@
                 <td><a href='mailto:<?php echo htmlspecialchars($usr['email']);?>'><?php echo htmlspecialchars($usr['email']);?></a></td>
                 <td><?php echo htmlspecialchars($usr['full_name']);?></td>
 
-                <td><?php echo $noofsurveyslist[$i];?></td>
+                <?php if(Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1) { ?>
+                    <td><?php echo $noofsurveyslist[$i];?></td>
+                <?php } ?>
 
                 <?php $uquery = "SELECT users_name FROM {{users}} WHERE uid=".$usr['parent_id'];
                     $uresult = dbExecuteAssoc($uquery); //Checked