Exclude current user from UserPicker search

wbvetal · Apr 25, 2014 · 49e1c53 · 49e1c53
1 parent 0c5d037
commit 49e1c53
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/protected/modules_core/user/resources/userpicker.js b/protected/modules_core/user/resources/userpicker.js
@@ -22,6 +22,7 @@ $.fn.userpicker = function (options) {
         currentValue: "",
         renderType: "normal", // possible values are "normal", "partial"
         focus: false,
+        userGuid: "",
         placeholderText: 'Add an user'
     }, options);
 
@@ -234,7 +235,7 @@ $.fn.userpicker = function (options) {
                     var _takenData = false;
 
                     // set options to link, that this entry is already taken or not available
-                    if ($('#' + uniqueID + '_' + json[i].guid).length != 0 || json[i].isMember == true) {
+                    if ($('#' + uniqueID + '_' + json[i].guid).length != 0 || json[i].isMember == true || json[i].guid == options.userGuid) {
                         _takenStyle = "opacity: 0.4;"
                         _takenData = true;
                     }

diff --git a/protected/modules_core/user/widgets/UserPickerWidget.php b/protected/modules_core/user/widgets/UserPickerWidget.php
@@ -51,6 +51,13 @@ class UserPickerWidget extends HWidget {
      */
     public $maxUsers = 50;
 
+    /**
+     * Set guid for the current user
+     *
+     * @var type string
+     */
+    public $userGuid = "";
+
     /**
      * Set focus to input or not
      *
@@ -108,6 +115,7 @@ public function run() {
             'currentValue' => $currentValue,
             'inputId' => $this->inputId,
             'focus' => $this->focus,
+            'userGuid' => $this->userGuid,
             'placeholderText' => $this->placeholderText,
         ));
     }

diff --git a/protected/modules_core/user/widgets/views/userPicker.php b/protected/modules_core/user/widgets/views/userPicker.php
@@ -38,7 +38,8 @@
                 maxUsers: '<?php echo $maxUsers; ?>',
                 searchUrl: '<?php echo $userSearchUrl; ?>',
                 currentValue: '<?php echo $newValue; ?>',
-                focus:'<?php echo $focus ?>',
+                focus:'<?php echo $focus; ?>',
+                userGuid:'<?php echo $userGuid; ?>',
                 placeholderText:'<?php echo $placeholderText; ?>'
             });
         });

diff --git a/protected/modules_core/wall/widgets/views/contentForm.php b/protected/modules_core/wall/widgets/views/contentForm.php
@@ -21,6 +21,7 @@
                 'inputId' => 'notifiyUserInput',
                 'userSearchUrl' => $this->createUrl($user_url, array('sguid' => $this->contentContainer->guid, 'keyword' => '-keywordPlaceholder-')),
                 'maxUsers' => 10,
+                'userGuid' => Yii::app()->user->guid,
                 'placeholderText' => Yii::t('WallModule.base', 'Add a member to notify'),
                 'focus' => true,
             ));