Problem/Motivation

@andrei.vesterli There appears to be issues with some fixes being merged into "main", while others are merged into "1.x". Each branch has different releases and fixes. Can you please fix this? I can confirm that 1.x does not contain this fix, and it doesn't contain the option to show multiple/all fix.

https://git.drupalcode.org/project/better_permissions_page/-/commits/1.x...

https://git.drupalcode.org/project/better_permissions_page/-/commits/mai...

Steps to reproduce

Install 1.0.5 and try to save permissions.

Proposed resolution

Merge main into 1.x, and stop using the "main" branch altogether if it's causing issues. Remove that branch.

Remaining tasks

User interface changes

API changes

Data model changes

Issue fork better_permissions_page-3582268

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

  • 3582268-merge-fixes Comparechanges, plain diff MR !8
  • 1.x Comparecompare
About issue forks

Comments

solideogloria created an issue. See original summary.

solideogloria’s picture

solideogloria commented
Title: Merge main branch into 1.x » Merge main branch into 1.x (1.x is missing fixes)
solideogloria’s picture

solideogloria commented
Related issues: +#3411508: Option to show multiple/all, +#3505315: Ajax error on permissions page

Fixes that weren't merged into 1.x

solideogloria’s picture

solideogloria commented
Related issues: +#3515789: Release that supports Drupal 11?

Another example of an issue that was previously fixed that had to be re-fixed, because it wasn't merged into 1.x

solideogloria’s picture

solideogloria commented
Related issues: +#3407115: Add a multiple-select role filtering

Another one missing from 1.x

solideogloria opened merge request !8

solideogloria’s picture

solideogloria commented
Status: Active » Needs review

I created a merge request, merging "main" into "1.x". Please review the changes.

solideogloria’s picture

solideogloria commented

I tested the changes on my site and the fixes for all the other issues are working. I can filter for multiple modules, select roles, and save permissions.

Composer patch:

    "drupal/better_permissions_page": {
      "#3582268: Merge main branch into 1.x (1.x is missing fixes)": "./patches/better_permissions_page-3582268-m8.diff"
    },

andrei.vesterli’s picture

andrei.vesterli
Primary language Romanian
Location Moldova, Chisinau
commented
Status: Needs review » Reviewed & tested by the community

Good catch man! Just mergeed the MR so, i think it's ok. I will prepare a new release tag later

andrei.vesterli’s picture

andrei.vesterli
Primary language Romanian
Location Moldova, Chisinau
commented
Status: Reviewed & tested by the community » Fixed

Now that this issue is closed, review the contribution record.

As a contributor, attribute any organization that helped you, or if you volunteered your own time.

Maintainers, credit people who helped resolve this issue.

solideogloria’s picture

solideogloria commented

Also, "1.x" doesn't show in the issue "Version" dropdown. Can you add a 1.x-dev release so that it will show?

  1. Your 1.x branch must have a corresponding release (usually 1.x-dev).
  2. Make sure "Show development branches" is enabled.

The fact that there's no dev release also made creating an issue fork harder, as some of the commands (shown with "show commands" on the issue page) don't show, so it created the fork using 1.x and didn't create a separate branch.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.