Merge branch 'develop' into active-session-icon

This commit is contained in:
Randall Morey authored and GitHub committed 2020-10-07 13:26:08 -04:00
commit 9841960624
3 files changed
+19 -1

No files matched your search

+6
View File
@@ -1,6 +1,7 @@
import GeneratedAccountModel from '../generated/models/account';
import { fragment } from 'ember-data-model-fragments/attributes';
import { computed } from '@ember/object';
import { equal } from '@ember/object/computed';
export default class AccountModel extends GeneratedAccountModel {
@@ -12,6 +13,11 @@ export default class AccountModel extends GeneratedAccountModel {
*/
@fragment('fragment-account-attributes', { defaultValue: {} }) attributes;
/**
* @type {boolean}
*/
@equal('type', 'password') isPassword;
/**
* Convenience for getting username in account.
* @type {string}
+8
View File
@@ -115,6 +115,14 @@
}
}
.doc-link {
.large {
svg {
transform: scale(0.8);
}
}
}
[class*="session-status-"] {
color: var(--ui-gray-subtler-2);
}
@@ -4,7 +4,11 @@
<table.header as |header|>
<header.row as |row|>
<row.headerCell>{{t 'form.name.label'}}</row.headerCell>
<row.headerCell>{{t 'form.username.label'}}</row.headerCell>
<row.headerCell>
{{#if @model.firstObject.isPassword}}
{{t 'form.login_name.label'}}
{{/if}}
</row.headerCell>
<row.headerCell>{{t 'form.id.label'}}</row.headerCell>
</header.row>
</table.header>