Fixes #25748 - fallback to login in user drop down

theforeman · Jan 10, 2019 · e1d7467 · e1d7467
1 parent 3f49431
commit e1d7467
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -129,6 +129,10 @@ def self.name_format
 
   attr_exportable :firstname, :lastname, :mail, :description, :fullname, :name => ->(user) { user.login }, :ssh_authorized_keys => ->(user) { user.ssh_keys.map(&:to_export_hash) }
 
+  def as_json(options = {})
+    super.tap { |h| h.key?('user') ? h['user']['name'] = name : h['name'] = name }
+  end
+
   class Jail < ::Safemode::Jail
     allow :login, :ssh_keys, :ssh_authorized_keys, :description, :firstname, :lastname, :mail
   end

diff --git a/webpack/assets/javascripts/react_app/components/Layout/Layout.fixtures.js b/webpack/assets/javascripts/react_app/components/Layout/Layout.fixtures.js
@@ -158,6 +158,7 @@ const user = {
       login: 'admin',
       firstname: 'Admin',
       lastname: 'User',
+      name: 'Admin User',
     },
   },
   user_dropdown: [
@@ -192,6 +193,7 @@ const serverUser = {
     user: {
       firstname: 'G',
       lastname: 'L',
+      name: 'G L',
     },
   },
   user_dropdown: [

diff --git a/...ssets/javascripts/react_app/components/Layout/__tests__/__snapshots__/Layout.test.js.snap b/...ssets/javascripts/react_app/components/Layout/__tests__/__snapshots__/Layout.test.js.snap
@@ -136,6 +136,7 @@ exports[`Layout rendering renders layout 1`] = `
             "id": 4,
             "lastname": "User",
             "login": "admin",
+            "name": "Admin User",
           },
         },
         "user_dropdown": Array [
@@ -275,6 +276,7 @@ exports[`Layout rendering renders layout 1`] = `
               "id": 4,
               "lastname": "User",
               "login": "admin",
+              "name": "Admin User",
             },
           },
           "user_dropdown": Array [

diff --git a/webpack/assets/javascripts/react_app/components/Layout/components/UserDropdowns.js b/webpack/assets/javascripts/react_app/components/Layout/components/UserDropdowns.js
@@ -28,7 +28,7 @@ const UserDropdowns = ({
         <NavDropdown componentClass="li" id="account_menu">
           <Dropdown.Toggle useAnchor className="nav-item-iconic">
             <Icon type="fa" name="user avatar small" />
-            {userInfo.firstname} {userInfo.lastname}
+            {userInfo.name}
           </Dropdown.Toggle>
           <Dropdown.Menu>
             {user.user_dropdown[0].children.map((item, i) =>

diff --git a/...vascripts/react_app/components/Layout/components/__snapshots__/UserDropdowns.test.js.snap b/...vascripts/react_app/components/Layout/components/__snapshots__/UserDropdowns.test.js.snap
@@ -38,9 +38,7 @@ exports[`UserDropdown rendering render switcher w/loading 1`] = `
         name="user avatar small"
         type="fa"
       />
-      G
-       
-      L
+      G L
     </DropdownToggle>
     <DropdownMenu
       bsClass="dropdown-menu"