Skip to content

Restructuring and wiki#153

Merged
Antoni-Czaplicki merged 10 commits intomainfrom
dev
May 5, 2025
Merged

Restructuring and wiki#153
Antoni-Czaplicki merged 10 commits intomainfrom
dev

Conversation

@Antoni-Czaplicki
Copy link
Copy Markdown
Contributor

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 organization field to the Team model, restructuring the serializers and views for the teams and users apps, and improving the user interface for team requests and navigation. Below is a categorized summary of the most important changes:

Database and Models:

  • Added an organization field to the Team model 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]
  • Introduced the OrganizationChoice class as an IntegerChoices helper for the organization field. (eproba/apps/teams/models.py)

Backend Restructuring:

  • Moved serializers and views for teams and users apps into dedicated api directories 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]
  • Added new viewsets for managing District, Team, Patrol, and User entities, including custom query filtering and permission checks. (eproba/apps/teams/api/views.py, eproba/apps/users/api/views.py) [1] [2]

Team Request Enhancements:

  • Updated the TeamRequestForm to include an organization field and limited function_level choices to the first two options. (eproba/apps/teams/forms.py)
  • Modified the team_request view to handle the new organization field and send email notifications asynchronously using threading. (eproba/apps/teams/views/team_request.py) [1] [2]

UI and Frontend Improvements:

  • Added a "Wiki" link to the navigation bar for easier access to the wiki section. (eproba/apps/core/templates/core/navbar.html)
  • Adjusted the padding, font size, and transform properties of a UI element for improved styling. (eproba/apps/core/templates/core/base.html)
  • Updated the team request template to display the new organization field. (eproba/apps/teams/templates/teams/team_request.html)

Admin and Wiki:

  • Added admin interfaces for Folder and Page models in the wiki app, including tree structure management for folders. (eproba/apps/wiki/admin.py)

@Antoni-Czaplicki Antoni-Czaplicki merged commit d840f14 into main May 5, 2025
10 checks passed
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.

1 participant