Restructuring and wiki#153
Merged
Antoni-Czaplicki merged 10 commits intomainfrom May 5, 2025
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request introduces several changes across multiple files, focusing on database updates, user and team management, and UI enhancements. The most significant updates include adding an
organizationfield to theTeammodel, restructuring the serializers and views for theteamsandusersapps, and improving the user interface for team requests and navigation. Below is a categorized summary of the most important changes:Database and Models:
organizationfield to theTeammodel with integer choices for "Organizacja Harcerzy" and "Organizacja Harcerek" to distinguish team affiliations. (eproba/apps/teams/models.py,eproba/apps/teams/migrations/0006_team_organization.py) [1] [2]OrganizationChoiceclass as anIntegerChoiceshelper for theorganizationfield. (eproba/apps/teams/models.py)Backend Restructuring:
teamsandusersapps into dedicatedapidirectories for better organization. (eproba/apps/teams/api/serializers.py,eproba/apps/teams/api/views.py,eproba/apps/users/api/serializers.py,eproba/apps/users/api/views.py) [1] [2] [3] [4]District,Team,Patrol, andUserentities, including custom query filtering and permission checks. (eproba/apps/teams/api/views.py,eproba/apps/users/api/views.py) [1] [2]Team Request Enhancements:
TeamRequestFormto include anorganizationfield and limitedfunction_levelchoices to the first two options. (eproba/apps/teams/forms.py)team_requestview to handle the neworganizationfield and send email notifications asynchronously using threading. (eproba/apps/teams/views/team_request.py) [1] [2]UI and Frontend Improvements:
eproba/apps/core/templates/core/navbar.html)eproba/apps/core/templates/core/base.html)organizationfield. (eproba/apps/teams/templates/teams/team_request.html)Admin and Wiki:
FolderandPagemodels in thewikiapp, including tree structure management for folders. (eproba/apps/wiki/admin.py)