From e1985e10ee3215a4b166661b1170c96e67bf130e Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Mon, 29 Jun 2020 11:06:27 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20user=20breadcr?= =?UTF-8?q?umb=20display=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/tests/unit/adapters/user-test.js | 10 ++++++++++ ui/core/app/components/form/user/index.hbs | 2 +- ui/core/app/controllers/orgs/org/users/user.js | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/api/tests/unit/adapters/user-test.js b/addons/api/tests/unit/adapters/user-test.js index 04c42f929..17dc82ff6 100644 --- a/addons/api/tests/unit/adapters/user-test.js +++ b/addons/api/tests/unit/adapters/user-test.js @@ -1,5 +1,6 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; +import config from 'ember-get-config'; module('Unit | Adapter | user', function(hooks) { setupTest(hooks); @@ -8,4 +9,13 @@ module('Unit | Adapter | user', function(hooks) { let adapter = this.owner.lookup('adapter:user'); assert.ok(adapter); }); + + test('it generates URL prefixes without project scope', function (assert) { + assert.expect(1); + const service = this.owner.lookup('service:scope'); + service.org = { id: 1 }; + service.project = { id: 2 }; + const adapter = this.owner.lookup('adapter:user'); + assert.equal(adapter.urlPrefix(), `${config.api.namespace}/orgs/1`); + }); }); diff --git a/ui/core/app/components/form/user/index.hbs b/ui/core/app/components/form/user/index.hbs index 9db695baa..e8d100b60 100644 --- a/ui/core/app/components/form/user/index.hbs +++ b/ui/core/app/components/form/user/index.hbs @@ -2,7 +2,7 @@ @onSubmit={{@submit}} @cancel={{@cancel}} @disabled={{@model.isSaving}} - @error={{true}} + @error={{@model.errors.base}} as |form| > diff --git a/ui/core/app/controllers/orgs/org/users/user.js b/ui/core/app/controllers/orgs/org/users/user.js index 7e0216636..3461021b1 100644 --- a/ui/core/app/controllers/orgs/org/users/user.js +++ b/ui/core/app/controllers/orgs/org/users/user.js @@ -7,5 +7,5 @@ export default class OrgsOrgUsersUserController extends Controller { /** * @type {string} */ - @alias('model.name') breadCrumb; + @alias('model.displayName') breadCrumb; }