Skip to content

Commit 864b085

Browse files
Merge pull request #443 from communitybridge/feature/restricted-org
Feature : Added restricted organization
2 parents 86984d6 + 12a7380 commit 864b085

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

src/app/core/models/organization.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export class OrganizationModel {
1010
signingEntityName: string;
1111
created: string;
1212
updated: string;
13+
isSanctioned:string;
1314
}
1415

1516
export class OrganizationListModel {

src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,4 +251,4 @@
251251
</div>
252252
</div>
253253
</div>
254-
</ng-template>
254+
</ng-template>

src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy {
3636
@ViewChild('signedCLANotFoundModal') signedCLANotFoundModal: TemplateRef<any>;
3737
@ViewChild('successModal') successModal: TemplateRef<any>;
3838
@ViewChild('warningModal') warningModal: TemplateRef<any>;
39+
@ViewChild('errorModal') errorModal: TemplateRef<any>;
3940

4041
selectedCompany: string;
4142
searchBoxValue: string;
@@ -181,11 +182,19 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy {
181182
.subscribe(
182183
(response) => {
183184
this.organization = response;
185+
if(!this.organization.isSanctioned){
184186
this.storageService.setItem(
185187
AppSettings.SELECTED_COMPANY,
186188
this.organization
187189
);
188-
this.checkEmployeeeSignature();
190+
this.checkEmployeeSignature();
191+
}else {
192+
this.message =
193+
`We're sorry, you are currently unable to acknowledge the Employee Contributor License Agreement (ECLA) for this organization.
194+
If you believe this may be an error, please contact
195+
<a href="https://jira.linuxfoundation.org/plugins/servlet/desk/portal/4/create/143" target="_blank">EasyCLA Support</a>`;
196+
this.openWithDismiss(this.warningModal);
197+
}
189198
},
190199
() => {
191200
this.storageService.removeItem(AppSettings.SELECTED_COMPANY);
@@ -206,7 +215,7 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy {
206215
);
207216
}
208217

209-
checkEmployeeeSignature() {
218+
checkEmployeeSignature() {
210219
this.alertService.clearAlert();
211220
const data = {
212221
project_id: this.projectId,

0 commit comments

Comments
 (0)