Add organization switching for administrators managing multiple organizations #5257

Copilot · 2025-12-10T23:52:26Z

Allow administrators to switch between organizations in the dashboard

Test Fix - Regular User Access

Fixed: Test test_regular_user_cannot_access_dashboard now properly tests a user with no organizations

Problem: The test setup was creating org3 with regular_user as admin, giving them access to an organization. This caused the test to fail because the view returned 200 (showing the organization) instead of 302 (redirecting away).

Solution: Changed org3 to not have an admin user initially. The organization is only managed by manager_user, ensuring regular_user truly has no organizations to access.

Changes in website/tests/test_organization.py:

Removed admin=self.regular_user from org3 creation
Added comment clarifying that org3 has no admin initially
Now regular_user has no organizations and the test correctly expects a redirect

This fix ensures:

✅ regular_user has no organizations (as intended by the test)
✅ manager_user can still manage org3 via managers relationship
✅ admin_user cannot access org3 (for other tests)
✅ All test scenarios work as expected

Previous Updates

JavaScript Block Fix:

Moved JavaScript from non-existent extra_js block to content block
Organization switcher now works correctly

Performance Optimization:

Fixed N+1 query problem (reduced from 6+ queries to 1)
Credit to @sidd190 for identifying this issue

Security Fix:

Fixed CodeQL "DOM text reinterpreted as HTML" alert
Added protocol validation, URL encoding, and safer navigation

All PR Review Comments Addressed:

Performance optimization (organizations_count in context)
Input validation (integer validation for switch_to)
Accessibility (aria-hidden on SVG icons)
Code quality (GitHub spelling, removed unused variable)
Comprehensive edge case tests (17 total test cases)

Test Coverage

Original tests: 13
New edge case tests: 4
Total: 17 comprehensive test cases

Original prompt

This section details on the original issue you should resolve

<issue_title>allow for administrators to switch to different organizations if they manage more than one in the dashboard</issue_title>
<issue_description></issue_description>

Comments on the Issue (you are @copilot in this section)

Fixes allow for administrators to switch to different organizations if they manage more than one in the dashboard #5256

💡 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.

coderabbitai · 2025-12-10T23:52:32Z

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Note

Other AI code review bot(s) detected

CodeRabbit 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.

Note

Free review on us!

CodeRabbit is offering free reviews until Wed Dec 17 2025 to showcase some of the refinements we've made.

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

Co-authored-by: DonnieBLT <[email protected]>

github-actions · 2025-12-11T00:09:33Z

❌ Pre-commit checks failed

The 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 run

After running these commands, the pre-commit hooks will automatically fix most issues.
Please review the changes, commit them, and push to your branch.

💡 Tip: You can set up pre-commit to run automatically on every commit by running:

pre-commit install

Pre-commit output

[INFO] Initializing environment for https://github.com/pre-commit/pre-commit-hooks.
[WARNING] repo `https://github.com/pre-commit/pre-commit-hooks` uses deprecated stage names (commit, push) which will be removed in a future version.  Hint: often `pre-commit autoupdate --repo https://github.com/pre-commit/pre-commit-hooks` will fix this.  if it does not -- consider reporting an issue to that repo.
[INFO] Initializing environment for https://github.com/pycqa/isort.
[WARNING] repo `https://github.com/pycqa/isort` uses deprecated stage names (commit, merge-commit, push) which will be removed in a future version.  Hint: often `pre-commit autoupdate --repo https://github.com/pycqa/isort` will fix this.  if it does not -- consider reporting an issue to that repo.
[INFO] Initializing environment for https://github.com/astral-sh/ruff-pre-commit.
[INFO] Initializing environment for https://github.com/djlint/djLint.
[INFO] Initializing environment for local.
[INFO] Installing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/pycqa/isort.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/astral-sh/ruff-pre-commit.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/djlint/djLint.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for local.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
check python ast.........................................................Passed
check builtin type constructor use.......................................Passed
check yaml...............................................................Passed
fix python encoding pragma...............................................Passed
mixed line ending........................................................Passed
isort....................................................................Passed
ruff.....................................................................Passed
ruff-format..............................................................Failed
- hook id: ruff-format
- files were modified by this hook

1 file reformatted, 462 files left unchanged

For more information, see the pre-commit documentation.

Co-authored-by: DonnieBLT <[email protected]>

Copilot

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_dashboard view to support organization switching with session-based persistence
Updated admin_organization_dashboard_detail view 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

website/templates/admin_dashboard_organization.html

website/tests/test_organization.py

website/templates/admin_dashboard_organization.html

website/views/organization.py

website/templates/admin_dashboard_organization.html

website/tests/test_organization.py

DonnieBLT · 2025-12-11T00:15:21Z

@copilot apply changes based on the comments in this thread

Co-authored-by: DonnieBLT <[email protected]>

github-actions · 2025-12-11T00:16:35Z

❌ Pre-commit checks failed

The 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 run

After running these commands, the pre-commit hooks will automatically fix most issues.
Please review the changes, commit them, and push to your branch.

💡 Tip: You can set up pre-commit to run automatically on every commit by running:

pre-commit install

Pre-commit output

[INFO] Initializing environment for https://github.com/pre-commit/pre-commit-hooks.
[WARNING] repo `https://github.com/pre-commit/pre-commit-hooks` uses deprecated stage names (commit, push) which will be removed in a future version.  Hint: often `pre-commit autoupdate --repo https://github.com/pre-commit/pre-commit-hooks` will fix this.  if it does not -- consider reporting an issue to that repo.
[INFO] Initializing environment for https://github.com/pycqa/isort.
[WARNING] repo `https://github.com/pycqa/isort` uses deprecated stage names (commit, merge-commit, push) which will be removed in a future version.  Hint: often `pre-commit autoupdate --repo https://github.com/pycqa/isort` will fix this.  if it does not -- consider reporting an issue to that repo.
[INFO] Initializing environment for https://github.com/astral-sh/ruff-pre-commit.
[INFO] Initializing environment for https://github.com/djlint/djLint.
[INFO] Initializing environment for local.
[INFO] Installing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/pycqa/isort.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/astral-sh/ruff-pre-commit.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/djlint/djLint.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for local.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
check python ast.........................................................Passed
check builtin type constructor use.......................................Passed
check yaml...............................................................Passed
fix python encoding pragma...............................................Passed
mixed line ending........................................................Passed
isort....................................................................Passed
ruff.....................................................................Passed
ruff-format..............................................................Failed
- hook id: ruff-format
- files were modified by this hook

1 file reformatted, 462 files left unchanged

For more information, see the pre-commit documentation.

website/templates/admin_dashboard_organization.html

github-actions · 2025-12-11T00:20:53Z

👋 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:

The PR author
DonnieBLT
coderabbitai
copilot

Once a valid peer review is submitted, this check will pass automatically. Thank you!

github-actions · 2025-12-15T10:12:09Z

❌ Pre-commit checks failed

The 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 run

After running these commands, the pre-commit hooks will automatically fix most issues.
Please review the changes, commit them, and push to your branch.

💡 Tip: You can set up pre-commit to run automatically on every commit by running:

pre-commit install

Pre-commit output

[INFO] Initializing environment for https://github.com/pre-commit/pre-commit-hooks.
[WARNING] repo `https://github.com/pre-commit/pre-commit-hooks` uses deprecated stage names (commit, push) which will be removed in a future version.  Hint: often `pre-commit autoupdate --repo https://github.com/pre-commit/pre-commit-hooks` will fix this.  if it does not -- consider reporting an issue to that repo.
[INFO] Initializing environment for https://github.com/pycqa/isort.
[WARNING] repo `https://github.com/pycqa/isort` uses deprecated stage names (commit, merge-commit, push) which will be removed in a future version.  Hint: often `pre-commit autoupdate --repo https://github.com/pycqa/isort` will fix this.  if it does not -- consider reporting an issue to that repo.
[INFO] Initializing environment for https://github.com/astral-sh/ruff-pre-commit.
[INFO] Initializing environment for https://github.com/djlint/djLint.
[INFO] Initializing environment for local.
[INFO] Installing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/pycqa/isort.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/astral-sh/ruff-pre-commit.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/djlint/djLint.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for local.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
check python ast.........................................................Passed
check builtin type constructor use.......................................Passed
check yaml...............................................................Passed
fix python encoding pragma...............................................Passed
mixed line ending........................................................Passed
isort....................................................................Passed
ruff.....................................................................Passed
ruff-format..............................................................Failed
- hook id: ruff-format
- files were modified by this hook

1 file reformatted, 471 files left unchanged

For more information, see the pre-commit documentation.

github-actions · 2025-12-15T10:19:12Z

❌ Pre-commit checks failed

The 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 run

After running these commands, the pre-commit hooks will automatically fix most issues.
Please review the changes, commit them, and push to your branch.

💡 Tip: You can set up pre-commit to run automatically on every commit by running:

pre-commit install

Pre-commit output

[INFO] Initializing environment for https://github.com/pre-commit/pre-commit-hooks.
[WARNING] repo `https://github.com/pre-commit/pre-commit-hooks` uses deprecated stage names (commit, push) which will be removed in a future version.  Hint: often `pre-commit autoupdate --repo https://github.com/pre-commit/pre-commit-hooks` will fix this.  if it does not -- consider reporting an issue to that repo.
[INFO] Initializing environment for https://github.com/pycqa/isort.
[WARNING] repo `https://github.com/pycqa/isort` uses deprecated stage names (commit, merge-commit, push) which will be removed in a future version.  Hint: often `pre-commit autoupdate --repo https://github.com/pycqa/isort` will fix this.  if it does not -- consider reporting an issue to that repo.
[INFO] Initializing environment for https://github.com/astral-sh/ruff-pre-commit.
[INFO] Initializing environment for https://github.com/djlint/djLint.
[INFO] Initializing environment for local.
[INFO] Installing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/pycqa/isort.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/astral-sh/ruff-pre-commit.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/djlint/djLint.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for local.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
check python ast.........................................................Passed
check builtin type constructor use.......................................Passed
check yaml...............................................................Passed
fix python encoding pragma...............................................Passed
mixed line ending........................................................Passed
isort....................................................................Passed
ruff.....................................................................Passed
ruff-format..............................................................Failed
- hook id: ruff-format
- files were modified by this hook

1 file reformatted, 471 files left unchanged

For more information, see the pre-commit documentation.

Initial plan

4bf182a

Copilot AI assigned Copilot and DonnieBLT Dec 10, 2025

github-project-automation bot added this to 📌 OWASP BLT Project Board Dec 10, 2025

github-project-automation bot moved this to Backlog in 📌 OWASP BLT Project Board Dec 10, 2025

Copilot started work on behalf of DonnieBLT December 10, 2025 23:52 View session

Copilot AI and others added 2 commits December 10, 2025 23:59

Add organization switching functionality for administrators

7c09911

Co-authored-by: DonnieBLT <[email protected]>

Add comprehensive tests for organization switching functionality

94d472e

Co-authored-by: DonnieBLT <[email protected]>

DonnieBLT marked this pull request as ready for review December 11, 2025 00:08

Copilot AI review requested due to automatic review settings December 11, 2025 00:08

github-actions bot added the files-changed: 3 PR changes 3 files label Dec 11, 2025

Copilot started reviewing on behalf of DonnieBLT December 11, 2025 00:08 View session

github-actions bot added the pre-commit: failed Pre-commit checks failed label Dec 11, 2025

DonnieBLT added the fix-pre-commit label Dec 11, 2025

github-actions bot removed the fix-pre-commit label Dec 11, 2025

Address code review feedback: improve security and performance

cf11b70

Co-authored-by: DonnieBLT <[email protected]>

Copilot AI reviewed Dec 11, 2025

View reviewed changes

github-actions bot added the tests: passed Django tests passed label Dec 11, 2025

Fix test consistency and update code comments

f1125a3

Co-authored-by: DonnieBLT <[email protected]>

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 found potential problems Dec 11, 2025

View reviewed changes

website/templates/admin_dashboard_organization.html Fixed Show fixed Hide fixed

Copilot AI requested a review from DonnieBLT December 11, 2025 00:20

Copilot finished work on behalf of DonnieBLT December 11, 2025 00:20

github-actions bot added the needs-peer-review PR needs peer review label Dec 11, 2025

Copilot started work on behalf of DonnieBLT December 11, 2025 00:21 View session

github-actions bot added the last-active: 0d PR last updated 0 days ago label Dec 15, 2025

Merge branch 'main' into copilot/allow-admin-switch-organizations

684e593

github-actions bot removed the last-active: 0d PR last updated 0 days ago label Dec 15, 2025

DonnieBLT added the fix-pre-commit label Dec 15, 2025

github-actions bot added tests: passed Django tests passed and removed fix-pre-commit tests: failed Django tests failed labels Dec 15, 2025

github-actions bot added last-active: 2d PR last updated 2 days ago and removed last-active: 0d PR last updated 0 days ago labels Jan 1, 2026

Uh oh!

Add organization switching for administrators managing multiple organizations #5257

Are you sure you want to change the base?

Add organization switching for administrators managing multiple organizations #5257

Conversation

Copilot AI commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Allow administrators to switch between organizations in the dashboard

Test Fix - Regular User Access

Previous Updates

Test Coverage

Comments on the Issue (you are @copilot in this section)

Uh oh!

coderabbitai bot commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Other AI code review bot(s) detected

Free review on us!

Uh oh!

github-actions bot commented Dec 11, 2025

❌ Pre-commit checks failed

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DonnieBLT commented Dec 11, 2025

Uh oh!

github-actions bot commented Dec 11, 2025

❌ Pre-commit checks failed

Uh oh!

Uh oh!

github-actions bot commented Dec 11, 2025

Uh oh!

github-actions bot commented Dec 15, 2025

❌ Pre-commit checks failed

Uh oh!

github-actions bot commented Dec 15, 2025

❌ Pre-commit checks failed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Copilot AI commented Dec 10, 2025 •

edited

Loading

coderabbitai bot commented Dec 10, 2025 •

edited

Loading