Skip to content

Allow tax_status to be updateable by consortium admin for consortium and consortium organizations #979

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
svogt0511 merged 6 commits into from
Jul 9, 2026
Merged

Allow tax_status to be updateable by consortium admin for consortium and consortium organizations #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db651dd
Add consortium admin to abilities calculation for 'create'
svogt0511 Jun 24, 2026
cf36389
Add tax status to edit form for consortium_admin. Remove abilities c…
svogt0511 Jun 24, 2026
2c86df2
tax status field.
svogt0511 Jun 25, 2026
2f4f9bc
Hide salesforce field from consortium admin on create/update organiza…
svogt0511 Jul 8, 2026
72b76e4
Fix tax status to be below country for admin.
svogt0511 Jul 8, 2026
6532ced
Fix consortium type and member fields to not show up in consortium fo…
svogt0511 Jul 9, 2026
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
49 changes: 43 additions & 6 deletions app/abilities/provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ export default class Provider extends Ability {
switch (this.get('currentUser.role_id')) {
case 'staff_admin':
return true;
case 'consortium_admin':
return true;
default:
return false;
}
Expand All @@ -23,11 +25,6 @@ export default class Provider extends Ability {
switch (this.get('currentUser.role_id')) {
case 'staff_admin':
return true;
case 'consortium_admin':
return (
this.get('currentUser.provider_id') ===
this.get('model.consortium.id')
);
default:
return false;
}
Expand Down Expand Up @@ -83,4 +80,44 @@ export default class Provider extends Ability {
return false;
}
}
}

@computed('currentUser.role_id', 'model.{id,provider_id}')
get canEditSalesforceField() {
switch (this.get('currentUser.role_id')) {
case 'staff_admin':
return true;
default:
return false;
}
}

@computed('currentUser.role_id', 'model.{id,provider_id}')
get canEditMemberTypeField() {
switch (this.get('currentUser.role_id')) {
case 'staff_admin':
return true;
default:
return false;
}
}

@computed('currentUser.role_id', 'model.{id,provider_id}')
get canEditConsortiumField() {
switch (this.get('currentUser.role_id')) {
case 'staff_admin':
return true;
default:
return false;
}
}

@computed('currentUser.role_id', 'model.{id,provider_id}')
get canEditActiveField() {
switch (this.get('currentUser.role_id')) {
case 'staff_admin':
return true;
default:
return false;
}
}
}
1 change: 1 addition & 0 deletions app/routes/providers/show/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export default class EditRoute extends Route {
return contact.deleted === null;
})
provider.set('filteredContacts', filteredContacts)
provider.set("consortium_id", this.modelFor('providers/show').get('consortium.id'));

return provider;
}
Expand Down
38 changes: 19 additions & 19 deletions app/templates/providers/new.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,25 +109,6 @@
{{titleize (humanize item)}}
</el.control>
</form.element>
<form.element
@controlType="power-select"
id="tax-status"
class="form-group"
@label="Tax Status"
@property="nonProfitStatus"
@options={{this.nonProfitStatuses}}
@destination={{this.nonProfitStatus}} as |el|
>
<el.control
@onChange={{action 'selectNonProfitStatus'}}
@search={{action 'searchNonProfitStatus'}}
@placeholder="Tax Status"
@searchPlaceholder="Type to search..."
@searchEnabled={{true}} as |item|
>
{{titleize item}}
</el.control>
</form.element>
{{#if (eq this.model.memberType 'consortium_organization')}}
<form.element
@controlType="power-select"
Expand Down Expand Up @@ -206,6 +187,25 @@
{{item.name}}
</el.control>
</form.element>
<form.element
@controlType="power-select"
id="tax-status"
class="form-group"
@label="Tax Status"
@property="nonProfitStatus"
@options={{this.nonProfitStatuses}}
@destination={{this.nonProfitStatus}} as |el|
>
<el.control
@onChange={{action 'selectNonProfitStatus'}}
@search={{action 'searchNonProfitStatus'}}
@placeholder="Tax Status"
@searchPlaceholder="Type to search..."
@searchEnabled={{true}} as |item|
>
{{titleize item}}
</el.control>
</form.element>
<form.element
@controlType="power-select"
id="organization-type"
Expand Down
59 changes: 37 additions & 22 deletions app/templates/providers/show/edit.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
{{if item.name item.name this.model.rorId}}
</el.control>
</form.element>
{{#if (can 'create provider')}}
{{#if (can 'editSalesforceField provider')}}
<form.element
@controlType="text"
id="salesforce-id"
Expand All @@ -75,7 +75,7 @@
@helpText="The Globus UUID used for token authentication."
/>
{{/if}}
{{#if (can 'create provider')}}
{{#if (can 'editMemberTypeField provider')}}
<form.element
@controlType="power-select"
id="member-type"
Expand All @@ -96,25 +96,8 @@
{{titleize (humanize item)}}
</el.control>
</form.element>
<form.element
@controlType="power-select"
id="tax-status"
class="form-group"
@label="Tax Status"
@property="nonProfitStatus"
@options={{this.nonProfitStatuses}}
@destination={{this.nonProfitStatus}} as |el|
>
<el.control
@onChange={{action 'selectNonProfitStatus'}}
@search={{action 'searchNonProfitStatus'}}
@placeholder="Tax Status"
@searchPlaceholder="Type to search..."
@searchEnabled={{true}} as |item|
>
{{titleize item}}
</el.control>
</form.element>
{{/if}}
{{#if (can 'editConsortiumField provider')}}
{{#if (eq this.model.memberType 'consortium_organization')}}
<form.element
@controlType="power-select"
Expand Down Expand Up @@ -212,6 +195,38 @@
{{item.name}}
</el.control>
</form.element>
{{#if (or
(can 'create provider')
(and
(or (eq this.model.memberType 'consortium')
(and
(eq this.model.memberType 'consortium_organization')
(eq this.model.consortium_id this.model.consortium.id)
)
)
)
)
}}
<form.element
@controlType="power-select"
id="tax-status"
class="form-group"
@label="Tax Status"
@property="nonProfitStatus"
@options={{this.nonProfitStatuses}}
@destination={{this.nonProfitStatus}} as |el|
>
<el.control
@onChange={{action 'selectNonProfitStatus'}}
@search={{action 'searchNonProfitStatus'}}
@placeholder="Tax Status"
@searchPlaceholder="Type to search..."
@searchEnabled={{true}} as |item|
>
{{titleize item}}
</el.control>
</form.element>
{{/if}}
<form.element
@controlType="power-select"
id="organization-type"
Expand Down Expand Up @@ -583,7 +598,7 @@
</form.element>
{{/if}}
{{/if}}
{{#if (can 'create provider')}}
{{#if (can 'editActiveField provider')}}
<form.element
@controlType="checkbox"
id="is-active"
Expand Down
44 changes: 22 additions & 22 deletions app/templates/providers/show/organizations/new.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
{{if item.name item.name this.model.organization.rorId}}
</el.control>
</form.element>
{{#if (can 'create provider')}}
{{#if (can 'editSalesforceField provider')}}
<form.element
@controlType="text"
id="salesforce-id"
Expand All @@ -99,27 +99,6 @@
<el.control id="globus-uuid-field" />
</form.element>
{{/if}}
{{#if (can 'create provider')}}
<form.element
@controlType="power-select"
id="tax-status"
class="form-group"
@label="Tax Status"
@property="nonProfitStatus"
@options={{this.nonProfitStatuses}}
@destination={{this.nonProfitStatus}} as |el|
>
<el.control
@onChange={{action 'selectNonProfitStatus'}}
@search={{action 'searchNonProfitStatus'}}
@placeholder="Tax Status"
@searchPlaceholder="Type to search..."
@searchEnabled={{true}} as |item|
>
{{titleize item}}
</el.control>
</form.element>
{{/if}}
<form.element
@controlType="text"
id="system-email"
Expand Down Expand Up @@ -174,6 +153,27 @@
{{item.name}}
</el.control>
</form.element>
{{#if (can 'create provider')}}
<form.element
@controlType="power-select"
id="tax-status"
class="form-group"
@label="Tax Status"
@property="nonProfitStatus"
@options={{this.nonProfitStatuses}}
@destination={{this.nonProfitStatus}} as |el|
>
<el.control
@onChange={{action 'selectNonProfitStatus'}}
@search={{action 'searchNonProfitStatus'}}
@placeholder="Tax Status"
@searchPlaceholder="Type to search..."
@searchEnabled={{true}} as |item|
>
{{titleize item}}
</el.control>
</form.element>
{{/if}}
<form.element
@controlType="power-select"
id="organization-type"
Expand Down
Loading