JonathanWilliamson/bconla
0
0
Fork 1
forked from infrastructure/conference-website
Code Issues Pull Requests Activity

Adding placeholder text in the presentation proposal form #1

Closed
Jason van Gumster wants to merge 16 commits from (deleted):proposal_placeholders into staging
pull from: (deleted):proposal_placeholders
merge into: JonathanWilliamson:staging

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 16 Files Changed 5 +16 -2
Jason van Gumster commented 2023-12-19 20:05:04 +01:00
Collaborator
Copy Link

I'm not entirely sure why there's a few other files listed on this. The only real difference with staging should be in conference_main/forms.py.

In any case, this is probably a good first experiment to see if I'm actually doing this correctly.

I'm not entirely sure why there's a few other files listed on this. The only real difference with staging *should* be in `conference_main/forms.py`. In any case, this is probably a good first experiment to see if I'm actually doing this correctly.
Jason van Gumster added 16 commits 2023-12-19 20:05:06 +01:00 
It's now possible to add Sponsors to an Edition. Sponsors are added
to the template context as 'edition_sponsors' as a dictionary sorted
by SponsorLevel order.
This reverts commit 8fcf1d7470.
This is kind of a dirty fix. I suspect that the MesssageForm class gets
used elsewhere (like for contact forms and the like), so if that's the
case, we may need to make a specific PresentationProposalForm class and
use that in `conference_main/views/event.py` (where the form is actually
built).
Jason van Gumster commented 2024-01-10 00:17:17 +01:00
Author
Collaborator
Copy Link

Tried the manual merge instructions, but just couldn't quite do it right... restarting with a new PR.

Tried the manual merge instructions, but just couldn't quite do it right... restarting with a new PR.

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: JonathanWilliamson/bconla#1
No description provided.
Delete Branch "(deleted):proposal_placeholders"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?