Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[2.2.x] Add Project Member Issues #3048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 13, 2019
Merged

[2.2.x] Add Project Member Issues #3048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9385255
Change PRTB filter for project member to filter serviceAccount roles
westlywright Jun 12, 2019
284610d
add closure action to prevent uncaught type error
westlywright Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/authenticated/project/security/members/index/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ export default Controller.extend(FilterState, {
headers,
searchText: '',
filterableContent: computed('model.projectRoleTemplateBindings.[]', function() {
return get(this, 'model.projectRoleTemplateBindings').filter((b) => get(b, 'userId'));
return get(this, 'model.projectRoleTemplateBindings').filter((b) => !get(b, 'serviceAccount'));
}),
});
2 changes: 1 addition & 1 deletion lib/shared/addon/components/form-members/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default Component.extend({
// editing
let mOut = [];

set(this, 'memberArray', bindings.filter((b) => get(b, 'userId')).forEach((b) => {
set(this, 'memberArray', bindings.filter((b) => !get(b, 'serviceAccount')).forEach((b) => {
let match = mOut.findBy('principalId', get(b, 'principalIdReference')) ;

if (match) {
Expand Down
15 changes: 12 additions & 3 deletions lib/shared/addon/components/project-member-row/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
{{else if principalId}}
<div class="gh-block">
<div class="gh-avatar">
<img src="{{principalGravatarSrc}}" width="34" height="34">
<img
src="{{principalGravatarSrc}}"
width="34"
height="34"
>
</div>
<div class="gh-block-content">
<div class="clip gh-block-name">
Expand Down Expand Up @@ -36,13 +40,18 @@
{{t 'generic.custom'}}
{{/if}}
{{else}}
{{searchable-select change="onSelect" content=choices value=roleTemplateId readOnly=noUpdate}}
{{searchable-select
change=(action "onSelect")
content=choices
value=roleTemplateId
readOnly=noUpdate
}}
{{/if}}
{{/if}}
</td>
<td>&nbsp;</td>
<div class="input-group-btn">
{{#unless owner}}
{{#unless owner}}
<button class="btn bg-primary btn-sm" {{action remove member}}>
<i class="icon icon-minus" />
</button>
Expand Down