Skip to content

Commit 48d0f20

Browse files
committed
disable org change when editing users
1 parent 00a3cf7 commit 48d0f20

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

ui/src/app/user/user-update.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,13 @@ <h1 id="jhi-ms-user-heading" class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser
7575
for="field_salesforceId.string"
7676
>Organization</label
7777
>
78-
<fieldset [disabled]="disableSalesForceIdDD()">
78+
<fieldset [disabled]="isExistentMember">
7979
<select
8080
*ngIf="memberList.length > 0"
8181
class="custom-select"
8282
name="salesforceId"
8383
id="field_salesforceId"
8484
formControlName="salesforceId"
85-
(change)="validateOrgOwners()"
8685
>
8786
<option *ngFor="let member of memberList" [ngValue]="member.salesforceId">{{ member.clientName }}</option>
8887
</select>

ui/src/app/user/user-update.component.ts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -173,18 +173,6 @@ export class UserUpdateComponent {
173173
this.router.navigate(['/'])
174174
}
175175

176-
disableSalesForceIdDD() {
177-
if (this.hasRoleAdmin()) {
178-
return false
179-
} else if (this.hasRoleOrgOwner() || this.hasRoleConsortiumLead()) {
180-
this.editForm.patchValue({
181-
salesforceId: this.getSalesForceId(),
182-
})
183-
return true
184-
}
185-
return this.isExistentMember
186-
}
187-
188176
getSalesForceId() {
189177
return this.accountService.getSalesforceId()
190178
}
@@ -213,12 +201,6 @@ export class UserUpdateComponent {
213201
this.hasOwner = value
214202
}
215203
})
216-
217-
if (this.editForm.get('mainContact')?.value) {
218-
this.editForm.get('salesforceId')?.disable()
219-
} else {
220-
this.editForm.get('salesforceId')?.enable()
221-
}
222204
}
223205
}
224206

0 commit comments

Comments
 (0)