Add organization switching for administrators managing multiple organizations #5257
+495
−96
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
Contributor
|
Important Review skippedBot user detected. To trigger a single review, invoke the You can disable this status message by setting the Note Other AI code review bot(s) detectedCodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review. Comment |
Co-authored-by: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>
Co-authored-by: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>
Contributor
❌ Pre-commit checks failedThe pre-commit hooks found issues that need to be fixed. Please run the following commands locally to fix them: # Install pre-commit if you haven't already
pip install pre-commit
# Run pre-commit on all files
pre-commit run --all-files
# Or run pre-commit on staged files only
pre-commit runAfter running these commands, the pre-commit hooks will automatically fix most issues. 💡 Tip: You can set up pre-commit to run automatically on every commit by running: pre-commit installPre-commit outputFor more information, see the pre-commit documentation. |
Co-authored-by: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds organization switching functionality to the administrator dashboard, allowing users who manage multiple organizations to switch between them and persist their selection across sessions. The changes enable non-superuser administrators and managers to access the organization dashboard with proper permission controls.
Key Changes:
- Modified
admin_organization_dashboardview to support organization switching with session-based persistence - Updated
admin_organization_dashboard_detailview to allow access for organization admins and managers, not just superusers - Redesigned the admin dashboard template with a modern UI using Tailwind CSS, including a dropdown switcher for multiple organizations
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 9 comments.
| File | Description |
|---|---|
| website/views/organization.py | Added organization filtering based on user role (admin/manager), implemented session-based organization switching with query parameter handling, and updated permission checks for detail view |
| website/tests/test_organization.py | Added comprehensive test suite (OrganizationSwitchingTests) covering access permissions, switching functionality, session persistence, and edge cases |
| website/templates/admin_dashboard_organization.html | Complete UI redesign with Tailwind CSS, added organization switcher dropdown, visual indicators for selected organization, and improved organization listing with logos and status badges |
Collaborator
|
@copilot apply changes based on the comments in this thread |
Co-authored-by: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>
Contributor
❌ Pre-commit checks failedThe pre-commit hooks found issues that need to be fixed. Please run the following commands locally to fix them: # Install pre-commit if you haven't already
pip install pre-commit
# Run pre-commit on all files
pre-commit run --all-files
# Or run pre-commit on staged files only
pre-commit runAfter running these commands, the pre-commit hooks will automatically fix most issues. 💡 Tip: You can set up pre-commit to run automatically on every commit by running: pre-commit installPre-commit outputFor more information, see the pre-commit documentation. |
Copilot
AI
changed the title
[WIP] Add functionality for administrators to switch organizations
Add organization switching for administrators managing multiple organizations
Dec 11, 2025
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Contributor
|
👋 Hi @copilot! This pull request needs a peer review before it can be merged. Please request a review from a team member who is not:
Once a valid peer review is submitted, this check will pass automatically. Thank you! |
Contributor
❌ Pre-commit checks failedThe pre-commit hooks found issues that need to be fixed. Please run the following commands locally to fix them: # Install pre-commit if you haven't already
pip install pre-commit
# Run pre-commit on all files
pre-commit run --all-files
# Or run pre-commit on staged files only
pre-commit runAfter running these commands, the pre-commit hooks will automatically fix most issues. 💡 Tip: You can set up pre-commit to run automatically on every commit by running: pre-commit installPre-commit outputFor more information, see the pre-commit documentation. |
Collaborator
|
@copilot address the most recent comments - fix this Review the code at the location below. A potential bug has been identified by an AI Location: website/views/organization.py#L168-L211 Potential issue: The |
Co-authored-by: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>
Contributor
Author
Fixed in commit ab9513b. The N+1 query problem has been resolved by evaluating the queryset once into a list at the beginning of the function. Before: 6+ database queries (exists, get, first, count, template iteration) All subsequent operations now use the in-memory list instead of hitting the database. This significantly improves performance for users managing multiple organizations. Thanks to @sidd190 for the excellent code review! |
Contributor
❌ Tests failedThe Django tests found issues that need to be fixed. Please review the test output below and fix the failing tests. How to run tests locally# Install dependencies
poetry install --with dev
# Run all tests
poetry run python manage.py test
# Run tests with verbose output
poetry run python manage.py test -v 3
# Run a specific test
poetry run python manage.py test app.tests.TestClass.test_methodTest output (last 100 lines)For more information, see the Django testing documentation. |
Contributor
❌ Pre-commit checks failedThe pre-commit hooks found issues that need to be fixed. Please run the following commands locally to fix them: # Install pre-commit if you haven't already
pip install pre-commit
# Run pre-commit on all files
pre-commit run --all-files
# Or run pre-commit on staged files only
pre-commit runAfter running these commands, the pre-commit hooks will automatically fix most issues. 💡 Tip: You can set up pre-commit to run automatically on every commit by running: pre-commit installPre-commit outputFor more information, see the pre-commit documentation. |
Collaborator
@copilot fix ======================================================================
|
…direct Co-authored-by: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>
Contributor
Author
Fixed in commit 727d93a. The test now correctly expects inactive users to be redirected to the login page by the |
Contributor
❌ Tests failedThe Django tests found issues that need to be fixed. Please review the test output below and fix the failing tests. How to run tests locally# Install dependencies
poetry install --with dev
# Run all tests
poetry run python manage.py test
# Run tests with verbose output
poetry run python manage.py test -v 3
# Run a specific test
poetry run python manage.py test app.tests.TestClass.test_methodTest output (last 100 lines)For more information, see the Django testing documentation. |
Contributor
❌ Pre-commit checks failedThe pre-commit hooks found issues that need to be fixed. Please run the following commands locally to fix them: # Install pre-commit if you haven't already
pip install pre-commit
# Run pre-commit on all files
pre-commit run --all-files
# Or run pre-commit on staged files only
pre-commit runAfter running these commands, the pre-commit hooks will automatically fix most issues. 💡 Tip: You can set up pre-commit to run automatically on every commit by running: pre-commit installPre-commit outputFor more information, see the pre-commit documentation. |
![sentry[bot]](https://avatars.githubusercontent.com/u/1396951?s=60&v=4){kind=small}
Comment on lines
+226
to
+236
| // Safely encode the organization ID in the query parameter | ||
| url.searchParams.set('switch_to', encodeURIComponent(selectedOrg)); | ||
| // Use location.assign for safer navigation | ||
| window.location.assign(url.toString()); | ||
| } else { | ||
| console.error("Invalid URL: must be same-origin http/https"); | ||
| } | ||
| } catch (e) { | ||
| console.error("Invalid URL format:", e); | ||
| } | ||
| } |
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
Contributor
❌ Tests failedThe Django tests found issues that need to be fixed. Please review the test output below and fix the failing tests. How to run tests locally# Install dependencies
poetry install --with dev
# Run all tests
poetry run python manage.py test
# Run tests with verbose output
poetry run python manage.py test -v 3
# Run a specific test
poetry run python manage.py test app.tests.TestClass.test_methodTest output (last 100 lines)For more information, see the Django testing documentation. |
Collaborator
|
@copilot fix Review the code at the location below. A potential bug has been identified by an AI Location: website/templates/admin_dashboard_organization.html#L220-L236 Potential issue: The |
Co-authored-by: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>
Contributor
Author
Fixed in commit de86518. The JavaScript has been moved from the non-existent |
github-actions
bot
added
last-active: 1d
Contributor
❌ Pre-commit checks failedThe pre-commit hooks found issues that need to be fixed. Please run the following commands locally to fix them: # Install pre-commit if you haven't already
pip install pre-commit
# Run pre-commit on all files
pre-commit run --all-files
# Or run pre-commit on staged files only
pre-commit runAfter running these commands, the pre-commit hooks will automatically fix most issues. 💡 Tip: You can set up pre-commit to run automatically on every commit by running: pre-commit installPre-commit outputFor more information, see the pre-commit documentation. |
Contributor
❌ Tests failedThe Django tests found issues that need to be fixed. Please review the test output below and fix the failing tests. How to run tests locally# Install dependencies
poetry install --with dev
# Run all tests
poetry run python manage.py test
# Run tests with verbose output
poetry run python manage.py test -v 3
# Run a specific test
poetry run python manage.py test app.tests.TestClass.test_methodTest output (last 100 lines)For more information, see the Django testing documentation. |
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.
Allow administrators to switch between organizations in the dashboard
JavaScript Block Fix
Fixed: Organization switcher JavaScript now properly renders on the page
Problem: The template was using
{% block extra_js %}which doesn't exist in the parentbase_dashboard.htmltemplate. In Django's template inheritance, blocks defined in child templates that don't exist in parent templates are silently ignored, causing the JavaScript to never render.Solution: Moved the JavaScript from the non-existent
extra_jsblock into thecontentblock at the end, ensuring it's properly included in the rendered page.Changes in
website/templates/admin_dashboard_organization.html:{% block extra_js %}...{% endblock extra_js %}contentblockPerformance Optimization - N+1 Query Fix
Fixed: N+1 query problem in
admin_organization_dashboardviewPrevious Updates
Test Fixes:
Security Fix:
All PR Review Comments Addressed:
Test Coverage
Original prompt
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.