Merge branch 'main' into roles-capabilities

This commit is contained in:
Dharini Jeeva authored and GitHub committed 2021-08-17 08:13:55 -07:00
commit 3cc5456bde
35 files changed
+1440 -599

No files matched your search

@@ -118,10 +118,13 @@
</form.textarea>
{{/if}}
<form.actions
@disabled={{if @model.cannotSave @model.cannotSave}}
@enableEditText={{t 'actions.edit-form'}}
@submitText={{t 'actions.save'}}
@cancelText={{t 'actions.cancel'}}
/>
{{#if (can 'save model' @model)}}
<form.actions
@disabled={{if @model.cannotSave @model.cannotSave}}
@enableEditText={{t 'actions.edit-form'}}
@submitText={{t 'actions.save'}}
@cancelText={{t 'actions.cancel'}}
/>
{{/if}}
</Rose::Form>
+8 -7
View File
@@ -46,11 +46,12 @@
{{/if}}
</form.textarea>
<form.actions
@disabled={{if @model.cannotSave @model.cannotSave}}
@enableEditText={{t 'actions.edit-form'}}
@submitText={{t 'actions.save'}}
@cancelText={{t 'actions.cancel'}}
/>
{{#if (can 'save model' @model)}}
<form.actions
@disabled={{if @model.cannotSave @model.cannotSave}}
@enableEditText={{t 'actions.edit-form'}}
@submitText={{t 'actions.save'}}
@cancelText={{t 'actions.cancel'}}
/>
{{/if}}
</Rose::Form>
@@ -111,12 +111,12 @@
</field.errors>
{{/if}}
</form.input>
<form.actions
@disabled={{if @model.cannotSave @model.cannotSave}}
@enableEditText={{t 'actions.edit-form'}}
@submitText={{t 'actions.save'}}
@cancelText={{t 'actions.cancel'}}
/>
{{#if (can 'save model' @model)}}
<form.actions
@disabled={{if @model.cannotSave @model.cannotSave}}
@enableEditText={{t 'actions.edit-form'}}
@submitText={{t 'actions.save'}}
@cancelText={{t 'actions.cancel'}}
/>
{{/if}}
</Rose::Form>
+8 -7
View File
@@ -46,11 +46,12 @@
{{/if}}
</form.textarea>
<form.actions
@disabled={{if @model.cannotSave @model.cannotSave}}
@enableEditText={{t 'actions.edit-form'}}
@submitText={{t 'actions.save'}}
@cancelText={{t 'actions.cancel'}}
/>
{{#if (can 'save model' @model)}}
<form.actions
@disabled={{if @model.cannotSave @model.cannotSave}}
@enableEditText={{t 'actions.edit-form'}}
@submitText={{t 'actions.save'}}
@cancelText={{t 'actions.cancel'}}
/>
{{/if}}
</Rose::Form>
@@ -1,13 +1,15 @@
<Rose::Dropdown
@text={{t 'actions.manage'}}
@dropdownRight={{true}}
as |dropdown|
>
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
{{#if (can 'delete model' @model)}}
<Rose::Dropdown
@text={{t 'actions.manage'}}
@dropdownRight={{true}}
as |dropdown|
>
{{t 'resources.credential-library.actions.delete'}}
</dropdown.button>
</Rose::Dropdown>
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
>
{{t 'resources.credential-library.actions.delete'}}
</dropdown.button>
</Rose::Dropdown>
{{/if}}
@@ -12,12 +12,16 @@
{{#each @model as |credentialLibrary|}}
<body.row as |row|>
<row.headerCell>
<LinkTo
@route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library'
@model={{credentialLibrary.id}}
>
{{#if (can 'read model' credentialLibrary)}}
<LinkTo
@route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library'
@model={{credentialLibrary.id}}
>
{{credentialLibrary.displayName}}
</LinkTo>
{{else}}
{{credentialLibrary.displayName}}
</LinkTo>
{{/if}}
<p>{{credentialLibrary.description}}</p>
</row.headerCell>
<row.cell>
@@ -6,12 +6,14 @@
<dropdown.link @route='scopes.scope.groups.group.add-members'>
{{t 'resources.group.actions.add-members'}}
</dropdown.link>
<dropdown.separator />
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
>
{{t 'resources.group.actions.delete'}}
</dropdown.button>
{{#if (can 'delete model' @model)}}
<dropdown.separator />
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
>
{{t 'resources.group.actions.delete'}}
</dropdown.button>
{{/if}}
</Rose::Dropdown>
@@ -35,9 +35,16 @@
{{#each @model as |group|}}
<body.row as |row|>
<row.headerCell>
<LinkTo @route='scopes.scope.groups.group' @model={{group.id}}>
{{#if (can 'read model' group)}}
<LinkTo
@route='scopes.scope.groups.group'
@model={{group.id}}
>
{{group.displayName}}
</LinkTo>
{{else}}
{{group.displayName}}
</LinkTo>
{{/if}}
<p>{{group.description}}</p>
</row.headerCell>
<row.cell>
@@ -38,12 +38,16 @@
{{#each @model as |target|}}
<body.row as |row|>
<row.headerCell>
<LinkTo
@route='scopes.scope.targets.target'
@model={{target.id}}
>
{{#if (can 'read model' target)}}
<LinkTo
@route='scopes.scope.targets.target'
@model={{target.id}}
>
{{target.displayName}}
</LinkTo>
{{else}}
{{target.displayName}}
</LinkTo>
{{/if}}
<p>{{target.description}}</p>
</row.headerCell>
<row.cell>
@@ -13,12 +13,14 @@
{{t 'resources.target.actions.add-credential-libraries'}}
</dropdown.link>
{{/if}}
<dropdown.separator />
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
>
{{t 'resources.target.actions.delete'}}
</dropdown.button>
{{#if (can 'delete model' @model)}}
<dropdown.separator />
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
>
{{t 'resources.target.actions.delete'}}
</dropdown.button>
{{/if}}
</Rose::Dropdown>
@@ -37,9 +37,13 @@
{{#each @model as |user|}}
<body.row as |row|>
<row.headerCell>
<LinkTo @route='scopes.scope.users.user' @model={{user.id}}>
{{#if (can 'read model' user)}}
<LinkTo @route='scopes.scope.users.user' @model={{user.id}}>
{{user.displayName}}
</LinkTo>
{{else}}
{{user.displayName}}
</LinkTo>
{{/if}}
<p>{{user.description}}</p>
</row.headerCell>
<row.cell>
@@ -1,17 +1,19 @@
<Rose::Dropdown
@text='{{t 'actions.manage'}}'
@dropdownRight={{true}}
as |dropdown|
>
<dropdown.link @route='scopes.scope.users.user.add-accounts'>
{{t 'resources.user.actions.add-accounts'}}
</dropdown.link>
<dropdown.separator />
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
{{#if (can 'delete model' @model)}}
<Rose::Dropdown
@text='{{t 'actions.manage'}}'
@dropdownRight={{true}}
as |dropdown|
>
{{t 'resources.user.actions.delete'}}
</dropdown.button>
</Rose::Dropdown>
<dropdown.link @route='scopes.scope.users.user.add-accounts'>
{{t 'resources.user.actions.add-accounts'}}
</dropdown.link>
<dropdown.separator />
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
>
{{t 'resources.user.actions.delete'}}
</dropdown.button>
</Rose::Dropdown>
{{/if}}