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.

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

Add project settings to Collect QR codes #475

Merged
merged 2 commits into from
Jun 25, 2021
Merged

Conversation

matthew-white
Copy link
Member

Closes #474.

Comment on lines -39 to -48
fullSettings() {
return {
general: {
...this.settings,
server_url: `${window.location.origin}${this.settings.server_url}`
},
// Collect requires the settings to have an `admin` property.
admin: {}
};
},
Copy link
Member Author

Choose a reason for hiding this comment

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

FieldKeyQrPanel and FormDraftTesting now do this work. I thought about leaving it here, but the code would have been surprisingly hairy, since settings now contains nested objects. I also think the new approach is a little clearer. Part of me doesn't love that FieldKeyQrPanel and FormDraftTesting now have some duplicate code, but it's just two components and not a lot of duplicate code. And probably we'll return to all this before too long once we start working on project settings.

Comment on lines -78 to -82
fieldKey: FieldKey, // eslint-disable-line vue/require-default-prop
managed: {
type: Boolean,
default: false
}
Copy link
Member Author

Choose a reason for hiding this comment

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

The linter no longer flags vue/require-default-prop, so this can be simplified.

};
},
baseUrl() {
Copy link
Member Author

Choose a reason for hiding this comment

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

I randomly noticed that this computed property isn't used anywhere anymore! Probably it should have been removed as part of 43ceaa0.

Copy link
Member

@lognaturel lognaturel left a comment

Choose a reason for hiding this comment

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

🎉

@matthew-white matthew-white merged commit 959401d into master Jun 25, 2021
@matthew-white matthew-white deleted the collect-project branch June 25, 2021 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add project name to configuration QR code
2 participants