Skip to content

Resolved [Issue #25] Ease in creating commitfest #34

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

Closed
wants to merge 3 commits into from

Conversation

ChiragAJain
Copy link

As per the issue, actions under admin view have been added as a drop-down option in commitfest\admin.py to ease the starting and ending of a commitfest and automatically updating its end date.

@JelteF
Copy link
Collaborator

JelteF commented Feb 17, 2025

Sorry, can you rebase this on main and force push again? I had forced pushed to main to resolve an on the prod branch.

You can do this by:

git fetch --all
git rebase origin/main -i
# Remove all the lines with commits that you didn't author
git push --force

@JelteF
Copy link
Collaborator

JelteF commented Feb 17, 2025

Actually something else seems to be off too, I don't see any commits that you authored in the list of commits for this PR.

@ChiragAJain
Copy link
Author

ChiragAJain commented Feb 17, 2025

Actually something else seems to be off too, I don't see any commits that you authored in the list of commits for this PR.

Could you check now? It is visible under the list of commits now.

@JelteF
Copy link
Collaborator

JelteF commented Feb 17, 2025

Yeah, I see it now. But it still needs a rebase.

mhagander and others added 2 commits February 17, 2025 17:49
Updated commitfest\admin.py to ease the starting and ending action on a commitfest via a drop-down list.
@ChiragAJain
Copy link
Author

Yeah, I see it now. But it still needs a rebase.

It is rebased now, sorry for the inconvenience

Comment on lines +7 to +10
<<<<<<< HEAD
- prod
=======
>>>>>>> 96758a1 (Implement github action to deploy to test environment)
Copy link
Collaborator

Choose a reason for hiding this comment

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

This contains a merge conflict.

Comment on lines +5 to +7
class CommitfestAdmin(admin.ModelAdmin):
@admin.action(description="Start selected Commitfest")
def startCommitfest(self,request,queryset):
Copy link
Collaborator

Choose a reason for hiding this comment

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

Instead of integrating these in the admin panel I think it would feel more natural to put these buttons next to the admin buttons:

image

The "Start commitfest" button should also do something else important: Change the next "Future" commitfest to "Open", or if no "Future" commitfest exist, create a new "open" commitfest.

@ChiragAJain
Copy link
Author

I will make the necessary changes and address the merge conflict

@JelteF
Copy link
Collaborator

JelteF commented Mar 22, 2025

@ChiragAJain do you still intend to update this PR?

@ChiragAJain
Copy link
Author

@ChiragAJain do you still intend to update this PR?

Sorry, I won't be. I have been caught up with few university commitments and can't find the time to review the code and make changes.

@JelteF
Copy link
Collaborator

JelteF commented Mar 22, 2025

Alright, no worries. I'll close this PR then, feel free to open a new one when you get time.

@JelteF JelteF closed this Mar 22, 2025
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.

3 participants