Skip to content
This repository has been archived by the owner on Nov 7, 2019. It is now read-only.

organisations: Stop using the organisations middleware #859

Merged
merged 4 commits into from
Aug 7, 2019

Conversation

rmader
Copy link
Contributor

@rmader rmader commented Aug 1, 2019

Instead of using the organisations/partners middleware, make the organisation
slug explicit in all templates, views, urls etc.

The only visible change here is that the dashboard now also uses the organisation slug.

This might require some manual testing to make sure nothing was left out that is not tested within the test suite.

@rmader rmader force-pushed the rm-2019-07-partners-cleanup branch from a154ebb to 3d65e30 Compare August 1, 2019 10:50
@rmader rmader changed the title WIP remove partner/organisation middleware organisations: Stop using the organisations middleware Aug 1, 2019
@rmader rmader force-pushed the rm-2019-07-partners-cleanup branch from 3d65e30 to 1837a1b Compare August 1, 2019 11:02
Module.add_to_class("get_absolute_url", module_get_absolute_url)
Project.add_to_class("get_absolute_url", project_get_absolute_url)
ProjectFormComponent.get_base_url = project_get_base_url
ModuleFormComponent.get_base_url = module_get_base_url
Copy link
Contributor Author

@rmader rmader Aug 1, 2019

Choose a reason for hiding this comment

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

These ones might be debatable @MagdaN :)

But IMHO still better than the (from us here) badly understood middleware.

@rmader rmader force-pushed the rm-2019-07-partners-cleanup branch from 9a2a192 to 81a64dc Compare August 1, 2019 15:06
Instead of using the organisations/partners middleware, make the organisation
slug explicit in all templates, views, urls etc.

The only visible change here is that the dashboard now also uses the organisation slug.
@rmader rmader force-pushed the rm-2019-07-partners-cleanup branch from 81a64dc to b3757d7 Compare August 1, 2019 15:16
@philli-m
Copy link
Contributor

philli-m commented Aug 1, 2019

Looking good for me and working :)

Copy link
Contributor

@fuzzylogic2000 fuzzylogic2000 left a comment

Choose a reason for hiding this comment

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

Alright, it reads well, but the links to old projects are not working and on the links for old projects (created still in current master branch) are not working, while newly created projects work fine. Also the header is the platform header (and not the partner/orga-header) anywhere.
And the timeline is a bit broken: the previous and next-buttons are in the wrong place.

@fuzzylogic2000
Copy link
Contributor

@MagdaN Let's look at it together next week!

@MagdaN
Copy link
Contributor

MagdaN commented Aug 7, 2019

@fuzzylogic2000 I can't reproduce you problem with the links but I fixed the header

Copy link
Contributor

@fuzzylogic2000 fuzzylogic2000 left a comment

Choose a reason for hiding this comment

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

It all works fine now! Yeah!

@fuzzylogic2000 fuzzylogic2000 merged commit a196d50 into master Aug 7, 2019
@fuzzylogic2000 fuzzylogic2000 deleted the rm-2019-07-partners-cleanup branch August 7, 2019 15:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants