Skip to content
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

Jump to bottom

Make Certify block non-editable if non-staff user (AGM Filings) #564

Merged
merged 1 commit into from
Nov 2, 2023
Merged

Make Certify block non-editable if non-staff user (AGM Filings) #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-filings-ui",
"version": "6.9.5",
"version": "6.9.6",
"private": true,
"appName": "Filings UI",
"sbcName": "SBC Common Components",
Expand Down
1 change: 1 addition & 0 deletions src/views/AgmExtension.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
:isCertified.sync="isCertified"
:certifiedBy.sync="certifiedBy"
:class="{ 'invalid-certify': !certifyFormValid && showErrors }"
:disableEdit="!isRoleStaff"
:entityDisplay="displayName()"
:message="certifyText(FilingCodes.AGM_EXTENSION)"
@valid="certifyFormValid=$event"
Expand Down
3 changes: 2 additions & 1 deletion src/views/AgmLocationChg.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
:isCertified.sync="isCertified"
:certifiedBy.sync="certifiedBy"
:class="{ 'invalid-certify': !certifyFormValid && showErrors }"
:disableEdit="!isRoleStaff"
:entityDisplay="displayName()"
:message="certifyText(FilingCodes.AGM_LOCATION_CHANGE)"
@valid="certifyFormValid=$event"
Expand Down Expand Up @@ -419,7 +420,7 @@ export default class AgmLocationChg extends Mixins(CommonMixin, DateMixin,
mounted (): void {
// Pre-populate the certified block with the logged in user's name (if not staff)
if (!this.isRoleStaff && this.getUserInfo) {
this.certifiedBy = this.getUserInfo.firstname + ' ' + this.getUserInfo.lastName
this.certifiedBy = this.getUserInfo.firstname + ' ' + this.getUserInfo.lastname
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So sorry about this 😊 Thanks for fixing it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries Sev! Happened to me too when I first wrote the variables. I had firstName and lastName so I was getting undefined undefined 😆

}

// always include agm location change code
Expand Down
4 changes: 1 addition & 3 deletions src/views/ConsentContinuationOut.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,9 +507,7 @@ export default class ConsentContinuationOut extends Mixins(CommonMixin, DateMixi

// Pre-populate the certified block with the logged in user's name (if not staff)
if (!this.isRoleStaff && this.getUserInfo) {
const firstName = this.getUserInfo?.firstname
const lastName = this.getUserInfo?.lastname
this.certifiedBy = firstName + ' ' + lastName
this.certifiedBy = this.getUserInfo.firstname + ' ' + this.getUserInfo.lastname
}

// always include consent continue out code
Expand Down
Loading