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

Two bug-fixes #2405

Merged
merged 4 commits into from
Oct 30, 2024
Merged

Two bug-fixes #2405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97b07e4
make sure non-monetary is not blank
SebinSong Oct 29, 2024
3cde2ca
Merge branch 'sebin/task/#2394-do-not-allow-blank-contribution' into …
SebinSong Oct 29, 2024
9bbe04a
fix typo
SebinSong Oct 29, 2024
4024c85
add variable
SebinSong Oct 30, 2024
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
2 changes: 1 addition & 1 deletion frontend/views/containers/contributions/NonMonetaryPledges.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fieldset(
.inputgroup
input.input(
type='text'
v-model='pledge.value'
v-model.trim='pledge.value'
data-test='inputNonMonetaryPledge'
:maxlength='config.maxChar'
:aria-label='L("Pledge value")'
Expand Down
6 changes: 5 additions & 1 deletion frontend/views/containers/group-settings/InvitationLinkModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ modal-template(ref='modal' :a11yTitle='L("Add new members")')
.c-container
template(v-if='link')
i18n.is-title-4(tag='h3') Share this link to grant access to your group.
i18n.has-text-1(tag='p') After the onboarding period has ended, everyone will be asked to vote on whether or not a new member should be added. But for now, enjoy 60 free passes!
i18n.has-text-1(tag='p' :args='{ count: anyoneLinkMax }') After the onboarding period has ended, everyone will be asked to vote on whether or not a new member should be added. But for now, enjoy {count} free passes!
link-to-copy.c-link(:link='link')
i18n.has-text-1(v-if='expireDate' tag='p' :args='{ expireDate }') This invite link expires on {expireDate}.
i18n.has-text-1(v-else tag='p') This invite link doesn't expire
Expand All @@ -33,6 +33,7 @@ import { humanDate } from '@model/contracts/shared/time.js'
import { REPLACE_MODAL } from '@utils/events.js'
import SvgBrokenLink from '@svgs/broken-link.svg'
import { buildInvitationUrl } from '@view-utils/buildInvitationUrl.js'
import { MAX_GROUP_MEMBER_COUNT } from '@model/contracts/shared/constants.js'

export default ({
name: 'InvitationLinkModal',
Expand Down Expand Up @@ -62,6 +63,9 @@ export default ({
},
expireDate () {
return humanDate(this.currentWelcomeInvite.expires, { month: 'long', day: 'numeric' })
},
anyoneLinkMax () {
return MAX_GROUP_MEMBER_COUNT
}
},
methods: {
Expand Down