Skip to content

Conversation

@andriyun
Copy link
Contributor

During the work on the upgrade, https://github.com/OS2Forms/OS2Forms8 to Drupal9 was there a need to update some modules to their higher version.

This PR includes changes related to Drupal 9 compatibility

The effect of these changes can be tested on OS2Forms8 solution by using code from d9 brunch https://github.com/OS2Forms/os2forms8/tree/d9

It's added to OS2Forms8 via replacing of version os2forms_forloeb_profile on the line https://github.com/OS2Forms/os2forms8/blob/d9/composer.json#L118

It is supposed to be changed to a new release tag afterward.

madsnorgaard and others added 7 commits October 5, 2021 10:49
 Remove custom_theme dependency and instead set Gin as default theme
* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>
* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

* Remove rules modules (#23)

* Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro).

* Remove Rules modules

Co-authored-by: Toke Fritzemeier <toke@magenta.dk>

* Remove rules (#24)

* Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro).

* Merge Develop into Main (#21)

* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

* Remove rules branch

* No installation of Rules modules

* Update Forløb module version

Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

* [#46397] Added menu overrides, which moves 'Webforms' and 'Maestro templates' to the main navigation

* Remove rules modules (#23)

* Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro).

* Remove Rules modules

Co-authored-by: Toke Fritzemeier <toke@magenta.dk>

* Remove rules (#24)

* Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro).

* Merge Develop into Main (#21)

* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

* Remove rules branch

* No installation of Rules modules

* Update Forløb module version

Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

* Add patch to dynamic entity reference module (#27)

* Add patch to dynamic entity reference module

* Add link to patch comment

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Copy link
Collaborator

@rimi-itk rimi-itk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment on os2forms/os2forms_forloeb version.

@madsnorgaard
Copy link
Collaborator

We should merge to develop before main.

@andriyun andriyun changed the base branch from main to develop December 16, 2021 08:09
@andriyun
Copy link
Contributor Author

andriyun commented Dec 16, 2021

Hi @madsnorgaard
I've changed the destination branch for PR from main to develop.

After this change, I see that PR got more commits to merge + merge conflict in composer.json on top of it.
It looks like develop branch has not gotten all commits that the main branch has.
See more here develop...main

Is it something you can manage to solve on your side?

@madsnorgaard
Copy link
Collaborator

I believe this is ready to merge.

@madsnorgaard madsnorgaard merged commit 79ac5cf into develop Dec 16, 2021
madsnorgaard added a commit that referenced this pull request Dec 20, 2021
* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

* [#46397] Added menu overrides, which moves 'Webforms' and 'Maestro templates' to the main navigation

* Remove rules modules (#23)

* Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro).

* Remove Rules modules

Co-authored-by: Toke Fritzemeier <toke@magenta.dk>

* Remove rules (#24)

* Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro).

* Merge Develop into Main (#21)

* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

* Remove rules branch

* No installation of Rules modules

* Update Forløb module version

Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

* Add patch to dynamic entity reference module (#27)

* Add patch to dynamic entity reference module

* Add link to patch comment

* Updated os2forms/os2forms and os2forms/os2forms_forloeb (#29)

* Added changes related to Drupal 9 compatibility (#30)

* Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro).

* Merge Develop into Main (#21)

* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

* Develop into main (#25)

* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

* Remove rules modules (#23)

* Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro).

* Remove Rules modules

Co-authored-by: Toke Fritzemeier <toke@magenta.dk>

* Remove rules (#24)

* Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro).

* Merge Develop into Main (#21)

* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

* Remove rules branch

* No installation of Rules modules

* Update Forløb module version

Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>

* Develop (#28)

* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

* [#46397] Added menu overrides, which moves 'Webforms' and 'Maestro templates' to the main navigation

* Remove rules modules (#23)

* Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro).

* Remove Rules modules

Co-authored-by: Toke Fritzemeier <toke@magenta.dk>

* Remove rules (#24)

* Remove custom_theme dependency and instead set Gin as default theme (Gin requires Claro).

* Merge Develop into Main (#21)

* Changing webform permissions for flowdesigner

* [#44232] Added yml-files for the 3 'default' date formats, to determine how they should be formatted

* [#44224] Changed permission to allow page to be added through the 'references'-tab

* [#44228] Changed permissions to allow 'selvbetjeningdesigner' to save selvbetjeningsside

* Add almost copy of Leder role as Borger role

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

* Remove rules branch

* No installation of Rules modules

* Update Forløb module version

Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>

* Add patch to dynamic entity reference module (#27)

* Add patch to dynamic entity reference module

* Add link to patch comment

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>

* Added changes related to Drupal 9 compatibility

* Upgrade os2forms/os2forms_forloeb to latest version

Co-authored-by: Mads Nørgaard <madsnorgaard@live.dk>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>
Co-authored-by: mn <mn@magenta-aps.dk>

* Downgrade os2forms/os2forms (#31)

* Update composer.json

Upgrade to latest version of OS2forms med Forløb 1.9.0

Co-authored-by: mb <mb@magenta-aps.dk>
Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com>
Co-authored-by: Toke Fritzemeier <toke@magenta.dk>
Co-authored-by: Mikkel Ricky <rimi@aarhus.dk>
Co-authored-by: Andriyun <andriy.yun@gmail.com>
@madsnorgaard madsnorgaard deleted the d9 branch January 21, 2022 08:59
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.

4 participants