Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Bootstrap 5 migration #6307

Merged
Zharktas merged 48 commits into
ckan:masterfrom
sagargg:migration/bootstrap5-upgrade
Feb 11, 2022
Merged

Bootstrap 5 migration #6307
Zharktas merged 48 commits into
ckan:masterfrom
sagargg:migration/bootstrap5-upgrade

Conversation

@sagargg
Copy link
Copy Markdown
Contributor

@sagargg sagargg commented Aug 4, 2021

Fixes #
#6012

Proposed fixes:

Bootstrap upgrade 5

Features:

  • includes tests covering changes
  • includes updated documentation
  • includes user-visible changes
  • includes API changes
  • includes bugfix for possible backport

Please [X] all the boxes above that apply

@sagargg sagargg force-pushed the migration/bootstrap5-upgrade branch from 1b2efd3 to 680d08e Compare August 31, 2021 05:33
@amercader
Copy link
Copy Markdown
Member

@sagargg It's so great to see progress here. How are you getting on with this? Do you need any support from the tech team or other devs?

@sagargg sagargg force-pushed the migration/bootstrap5-upgrade branch from 1b51bc5 to 27dd57b Compare September 3, 2021 04:15
@sagargg sagargg force-pushed the migration/bootstrap5-upgrade branch from 4483060 to cf21905 Compare September 30, 2021 08:59
@sagargg sagargg force-pushed the migration/bootstrap5-upgrade branch from 2689b72 to de2ffa7 Compare January 27, 2022 14:32
@amercader amercader self-assigned this Feb 1, 2022
@sagargg
Copy link
Copy Markdown
Contributor Author

sagargg commented Feb 5, 2022

Hi @pdelboca @amercader, What is blocking here to merge this PR?

@sagargg sagargg force-pushed the migration/bootstrap5-upgrade branch from 910be03 to f7db7cc Compare February 5, 2022 07:53
@Zharktas
Copy link
Copy Markdown
Member

Zharktas commented Feb 5, 2022

@sagargg it's mostly time constraints, I'll intend to have some final review of this hopefully next week.

@Zharktas
Copy link
Copy Markdown
Member

Zharktas commented Feb 7, 2022

When bs3-templates are used, it loads the wrong base directory, it still uses public instead of public-bs3 which results broken UI's.
Additionally the trash in ckan-admin seems to be broken on bs5 templates.

image

In above image, there should be deleted dataset shown.

image

@Zharktas
Copy link
Copy Markdown
Member

Zharktas commented Feb 8, 2022

We discussed this on the dev meeting and once the bs3 templates use bs3 javascript files, this can be merged, rest of the issues can be fixed later on as the next ckan release is not scheduled yet.

@sagargg
Copy link
Copy Markdown
Contributor Author

sagargg commented Feb 9, 2022

@Zharktas could you double check please. bs3 resources are loading for me.

ckan.base_public_folder=public-bs3
ckan.base_templates_folder=templates-bs3

@sagargg
Copy link
Copy Markdown
Contributor Author

sagargg commented Feb 9, 2022

@Zharktas fixed broken UI in admin trash page.

@Zharktas
Copy link
Copy Markdown
Member

Zharktas commented Feb 9, 2022

Bah, there where two different settings, which I don't like very much but that's how it was previously in similar migration so no need to change that. Can you update the error messages to contain valid options here and here and add a changelog entry in changes/6307.feature file, then were good to go.

@sagargg
Copy link
Copy Markdown
Contributor Author

sagargg commented Feb 10, 2022

@Zharktas Done.

Copy link
Copy Markdown
Member

@Zharktas Zharktas left a comment

Choose a reason for hiding this comment

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

Just a minor thing to fix and then I'll merge this :)

Comment thread ckan/config/environment.py Outdated
Comment thread ckan/config/environment.py Outdated
@Zharktas Zharktas merged commit 06caebe into ckan:master Feb 11, 2022
@Zharktas Zharktas mentioned this pull request Feb 11, 2022
@pdelboca
Copy link
Copy Markdown
Member

This is a great work @sagargg ! Thank you so much for this PR :)

And thanks @Zharktas for following up and merging it.

@amercader
Copy link
Copy Markdown
Member

🎉 Thanks @sagargg for the hard work and @Zharktas for the review!

ykiu added a commit to ykiu/ckanext-collaborator_orgs that referenced this pull request Oct 6, 2022
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.

5 participants