Close #3981

concretecms · Jun 29, 2016 · 461f796 · 461f796
1 parent bd5b8ad
commit 461f796
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 15 deletions.
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
@@ -306,7 +306,7 @@ module.exports = function(grunt) {
         ccm_users: {
             dest: '<%= DIR_BASE %>/concrete/js/users.js',
             src: [
-                '<%= DIR_BASE %>/concrete/js/build/core/sitemap/selector.js'
+                '<%= DIR_BASE %>/concrete/js/build/core/user/selector.js'
             ]
         },
 

diff --git a/concrete/config/app.php b/concrete/config/app.php
@@ -313,6 +313,7 @@
          */
         "/ccm/system/user/add_group" => array('\Concrete\Controller\Backend\User::addGroup'),
         "/ccm/system/user/remove_group" => array('\Concrete\Controller\Backend\User::removeGroup'),
+        "/ccm/system/user/get_json" => array('\Concrete\Controller\Backend\User::getJSON'),
 
         /*
          * Page actions - non UI

diff --git a/concrete/css/build/core/app/components.less b/concrete/css/build/core/app/components.less
@@ -212,6 +212,15 @@ div.ccm-item-selector {
     background-color: darken(#f2f2f2, 3%);
   }
 
+  div.ccm-item-selector-item-selected-thumbnail {
+    margin-right: 10px; float: left;
+
+    img {
+      max-width: 20px;
+      max-height: 20px;
+    }
+  }
+
   a {
     color: #606060;
     display: block;

diff --git a/concrete/js/build/core/user/selector.js b/concrete/js/build/core/user/selector.js
@@ -15,8 +15,7 @@
         my.options = options;
         my._chooseTemplate = _.template(my.chooseTemplate, {'options': my.options});
         my._loadingTemplate = _.template(my.loadingTemplate, {'options': my.options});
-        my._pageLoadedTemplate = _.template(my.pageLoadedTemplate);
-        my._pageMenuTemplate = _.template(ConcretePageAjaxSearchMenu.get());
+        my._userLoadedTemplate = _.template(my.userLoadedTemplate);
 
         my.$element.append(my._chooseTemplate);
         my.$element.on('click', 'a[data-user-selector-link=choose]', function(e) {
@@ -33,6 +32,17 @@
         if (my.options.uID) {
             my.loadUser(my.options.uID);
         }
+
+        ConcreteEvent.unsubscribe('UserSearchDialogSelectUser.core');
+        ConcreteEvent.unsubscribe('UserSearchDialogAfterSelectUser.core');
+        ConcreteEvent.subscribe('UserSearchDialogSelectUser.core', function(e, data) {
+            my.loadUser(data.uID);
+        });
+
+        ConcreteEvent.subscribe('UserSearchDialogAfterSelectUser.core', function(e) {
+            jQuery.fn.dialog.closeTop();
+        });
+
     }
 
     ConcreteUserSelector.prototype = {
@@ -43,23 +53,32 @@
         loadingTemplate: '<div class="ccm-item-selector"><div class="ccm-item-selector-choose"><i class="fa fa-spin fa-spinner"></i> <%=options.loadingText%></div></div>',
         userLoadedTemplate: '<div class="ccm-item-selector"><div class="ccm-item-selector-item-selected">' +
             '<input type="hidden" name="<%=inputName%>" value="<%=user.uID%>" />' +
+            '<div class="ccm-item-selector-item-selected-thumbnail"><%=user.avatar%></div>' +
             '<a data-user-selector-action="clear" href="#" class="ccm-item-selector-clear"><i class="fa fa-close"></i></a>' +
-            '<div class="ccm-item-selector-item-selected-title"><%=user.name%></div>' +
+            '<div class="ccm-item-selector-item-selected-title"><%=user.displayName%></div>' +
             '</div></div>',
 
         loadUser: function(uID) {
             var my = this;
             my.$element.html(my._loadingTemplate);
-            /*
-            ConcretePageAjaxSearch.getPageDetails(cID, function(r) {
-                var page = r.pages[0];
-                my.$element.html(my._pageLoadedTemplate({'inputName': my.options.inputName, 'page': page}));
-                my.$element.on('click', 'a[data-page-selector-action=clear]', function(e) {
-                    e.preventDefault();
-                    my.$element.html(my._chooseTemplate);
-                });
+
+            $.ajax({
+                type: 'post',
+                dataType: 'json',
+                url: CCM_DISPATCHER_FILENAME + '/ccm/system/user/get_json',
+                data: {'uID': uID},
+                error: function(r) {
+                    ConcreteAlert.dialog('Error', r.responseText);
+                },
+                success: function(r) {
+                    var user = r.users[0];
+                    my.$element.html(my._userLoadedTemplate({'inputName': my.options.inputName, 'user': user}));
+                    my.$element.on('click', 'a[data-user-selector-action=clear]', function(e) {
+                        e.preventDefault();
+                        my.$element.html(my._chooseTemplate);
+                    });
+                }
             });
-            */
         }
     }
 

diff --git a/concrete/src/Form/Service/Widget/UserSelector.php b/concrete/src/Form/Service/Widget/UserSelector.php
@@ -15,7 +15,7 @@ class UserSelector
      *
      * @param int $uID
      */
-    public function selectPage($fieldName, $uID = false)
+    public function selectUser($fieldName, $uID = false)
     {
         $v = \View::getInstance();
         $v->requireAsset('core/users');
@@ -30,7 +30,7 @@ public function selectPage($fieldName, $uID = false)
         }
 
         if ($selectedUID) {
-            $args = "{'inputName': '{$fieldName}', 'cID': {$selectedUID}}";
+            $args = "{'inputName': '{$fieldName}', 'uID': {$selectedUID}}";
         } else {
             $args = "{'inputName': '{$fieldName}'}";
         }

diff --git a/concrete/src/User/EditResponse.php b/concrete/src/User/EditResponse.php
@@ -24,6 +24,7 @@ public function getJSONObject()
             $uo = new stdClass();
             $uo->uID = $user->getUserID();
             $uo->displayName = $user->getUserDisplayName();
+            $uo->avatar = $user->getUserAvatar()->output();
             $o->users[] = $uo;
         }