Skip to content

Commit

Permalink
Merge pull request #1113 from zhx828/fix-company-update
Browse files Browse the repository at this point in the history
Update confirm model type when changing license type with user associated
  • Loading branch information
zhx828 authored May 2, 2024
2 parents 2f3088b + 30ffd16 commit c67b091
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/main/webapp/app/pages/companyPage/CompanyPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ export default class CompanyPage extends React.Component<ICompanyPage> {
}

@action.bound
showConfirmModal(event: any, value: any) {
onValidFormSubmit(event: any, value: any) {
this.formValues = value;
// Show warnings when license status is being changed and there are company users
if (
Expand All @@ -304,6 +304,7 @@ export default class CompanyPage extends React.Component<ICompanyPage> {
LICENSE_STATUS_UPDATE_MESSAGES[this.company.licenseStatus][
this.selectedLicenseStatus
];
this.simpleConfirmModalType = SimpleConfirmModalType.UPDATE_COMPANY;
} else {
this.onConfirmUpdateCompany();
}
Expand Down Expand Up @@ -539,7 +540,7 @@ export default class CompanyPage extends React.Component<ICompanyPage> {
</Col>
</Row>
<AvForm
onValidSubmit={this.showConfirmModal}
onValidSubmit={this.onValidFormSubmit}
onKeyPress={(event: any) => {
if (event.which === 13) {
event.preventDefault();
Expand Down

0 comments on commit c67b091

Please sign in to comment.