Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DMPRoadmap/roadmap
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: DMPRoadmap/roadmap
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aaron/issue/3561
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 5 files changed
  • 3 contributors

Commits on Dec 2, 2025

  1. Issue #3561 - Fix for bug "Discrepancy in Org Admin view of the

        Organisation Plans and the related CSV Download".
    
        Changes:
        - where(Role.creator_condition) condition added to Plans retrieved in
          the Org model's org_admin_plans method. This ensures that Plans
        returned are only active plans.
        - To avoid duplication we removed .where(Role.creator_condition) in
          org_admin method in app/controllers/paginable/plans_controller.rb from
          line
           plans = plans.joins(:template, roles: [user::org]).where(Role.creator_condition).
        - Updated RSpec tests for Org method org_admin_plans() in spec/models/org_spec.rb.
        - Update CHANGELOG.
    John Pinto authored and johnpinto1 committed Dec 2, 2025
    Configuration menu
    Copy the full SHA
    79d4571 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2025

  1. Issue #3561 - Refactoring code based on comments bt @aaronskiba

    Changes:
      - Refactored Org model org_admin_plans() method.
      - Refactored Paginable Plans controller method org_admin().
    johnpinto1 committed Dec 4, 2025
    Configuration menu
    Copy the full SHA
    0c98319 View commit details
    Browse the repository at this point in the history
  2. Updated RSpec spec/models/org_spec.rb to fix a bug associated with

    coowner being used incorrectly as an Role access_type. A coowner is any
    user apart from the plan creator with the Role administrator.
    johnpinto1 committed Dec 4, 2025
    Configuration menu
    Copy the full SHA
    fc48b6c View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2025

  1. Refactor role & visibility traits in Plan factory

    DRY up FactoryBot traits for roles and plan visibility by consolidating repetitive definitions into iteration loops.
    aaronskiba committed Dec 7, 2025
    Configuration menu
    Copy the full SHA
    e9acba9 View commit details
    Browse the repository at this point in the history
  2. Rework org_admin_plans spec

    Redesign org_admin_plans tests for clarity and maintainability:
    
    - Introduce helper methods for plan creation and role deactivation.
    - Organize plans into native vs affiliated hashes for clearer context.
    - Use shared examples to consolidate repetitive expectations.
    aaronskiba committed Dec 7, 2025
    Configuration menu
    Copy the full SHA
    8cbcfda View commit details
    Browse the repository at this point in the history
Loading