Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

respect default_page_types in actionmenu if folder_contents #1005

Merged
merged 4 commits into from
Aug 3, 2020

Conversation

pbauer
Copy link
Sponsor Member

@pbauer pbauer commented Jul 30, 2020

@mister-roboto
Copy link

@pbauer thanks for creating this Pull Request and help improve Plone!

To ensure that these changes do not break other parts of Plone, the Plone test suite matrix needs to pass.

Whenever you feel that the pull request is ready to be tested, either start all jenkins jobs pull requests by yourself, or simply add a comment in this pull request stating:

@jenkins-plone-org please run jobs

With this simple comment all the jobs will be started automatically.

Happy hacking!

@pbauer
Copy link
Sponsor Member Author

pbauer commented Jul 30, 2020

@jenkins-plone-org please run jobs

Copy link
Member

@ale-rt ale-rt left a comment

Choose a reason for hiding this comment

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

LGTM

@pbauer
Copy link
Sponsor Member Author

pbauer commented Jul 31, 2020

I'm not sure why travis fails with:

undefined is not an object (evaluating 'app.defaultPageTypes.indexOf')

Could it be that the build requires the source-checkout of plone.app.content or did I miss something when writing the code? It worked fine locally.

Also: Once this is merged plone.staticresources needs to be added to checkouts.cfg of coredev? Do I need to do all the other things it says in https://github.com/plone/plone.staticresources/#how-to-upgrade-the-resources-in-this-package?

@vincentfretin
Copy link
Member

The mockup tests doesn't depends on Plone, do a search for the failing test "use special view action for special types". The test is defined in mockup/tests/pattern-structure-test.js. You may need to add defaultPageTypes to the mock defined there.
Travis actually seems to test only with PhantomJS 8 times. :) Please test with the make test command (PhantomJS) and then with make test-dev (Chrome) locally. Both are green in master.

Yes you need to do all the things described in https://github.com/plone/plone.staticresources/#how-to-upgrade-the-resources-in-this-package and you need to checkout plone.staticresources yes like the documentation says. I updated it recently when I did the last upgrade step, I hope the instructions are clear.

@pbauer
Copy link
Sponsor Member Author

pbauer commented Aug 3, 2020

@vincentfretin thanks for the info. I fixed the tests and will now proceed to follow your docs 😄

@pbauer pbauer merged commit c875ad1 into master Aug 3, 2020
pbauer added a commit to plone/plone.staticresources that referenced this pull request Aug 3, 2020
@jensens jensens deleted the respect_default_page_types_in_actionmenu branch August 4, 2020 11:02
mister-roboto pushed a commit to plone/buildout.coredev that referenced this pull request Aug 4, 2020
Branch: refs/heads/master
Date: 2020-08-03T14:57:04+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.staticresources@59f05eb

update mockup to include plone/mockup#1005

Files changed:
A news/94.bugfix
A src/plone/staticresources/upgrades/10.zcml
A src/plone/staticresources/upgrades/profiles/10/registry.xml
M package.json
M src/plone/staticresources/profiles/default/metadata.xml
M src/plone/staticresources/profiles/default/registry/bundles.xml
M src/plone/staticresources/setuphandlers.py
M src/plone/staticresources/static/plone-logged-in-compiled.js
M src/plone/staticresources/static/plone-logged-in-compiled.min.js
M src/plone/staticresources/static/plone-logged-in-compiled.min.js.map
M src/plone/staticresources/upgrades/configure.zcml
Repository: plone.staticresources

Branch: refs/heads/master
Date: 2020-08-03T15:47:52+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.staticresources@815b215

add whaever happend after running yarn

Files changed:
M src/plone/staticresources/static/components/mockup/CHANGES.rst
M src/plone/staticresources/static/components/mockup/mockup/patterns/structure/js/actionmenu.js
M src/plone/staticresources/static/components/mockup/mockup/patterns/structure/pattern.js
M src/plone/staticresources/static/components/mockup/package.json
M src/plone/staticresources/static/components/mockup/setup.py
M yarn.lock
D src/plone/staticresources/static/components/mockup/news/1000.bugfix
D src/plone/staticresources/static/components/mockup/news/1002.bugfix
D src/plone/staticresources/static/components/mockup/news/1003.bugfix
D src/plone/staticresources/static/components/mockup/news/990.bugfix
D src/plone/staticresources/static/components/mockup/news/991.bugfix
D src/plone/staticresources/static/components/mockup/news/996.bugfix
D src/plone/staticresources/static/components/mockup/news/997.bugfix
Repository: plone.staticresources

Branch: refs/heads/master
Date: 2020-08-04T19:39:12+02:00
Author: Maurits van Rees (mauritsvanrees) <m.van.rees@zestsoftware.nl>
Commit: plone/plone.staticresources@ab7dbfe

Merge pull request #94 from plone/update-structure

update mockup

Files changed:
A news/94.bugfix
A src/plone/staticresources/upgrades/10.zcml
A src/plone/staticresources/upgrades/profiles/10/registry.xml
M package.json
M src/plone/staticresources/profiles/default/metadata.xml
M src/plone/staticresources/profiles/default/registry/bundles.xml
M src/plone/staticresources/setuphandlers.py
M src/plone/staticresources/static/components/mockup/CHANGES.rst
M src/plone/staticresources/static/components/mockup/mockup/patterns/structure/js/actionmenu.js
M src/plone/staticresources/static/components/mockup/mockup/patterns/structure/pattern.js
M src/plone/staticresources/static/components/mockup/package.json
M src/plone/staticresources/static/components/mockup/setup.py
M src/plone/staticresources/static/plone-logged-in-compiled.js
M src/plone/staticresources/static/plone-logged-in-compiled.min.js
M src/plone/staticresources/static/plone-logged-in-compiled.min.js.map
M src/plone/staticresources/upgrades/configure.zcml
M yarn.lock
D src/plone/staticresources/static/components/mockup/news/1000.bugfix
D src/plone/staticresources/static/components/mockup/news/1002.bugfix
D src/plone/staticresources/static/components/mockup/news/1003.bugfix
D src/plone/staticresources/static/components/mockup/news/990.bugfix
D src/plone/staticresources/static/components/mockup/news/991.bugfix
D src/plone/staticresources/static/components/mockup/news/996.bugfix
D src/plone/staticresources/static/components/mockup/news/997.bugfix
pbauer added a commit that referenced this pull request Aug 6, 2020
pbauer added a commit that referenced this pull request Aug 6, 2020
mister-roboto pushed a commit to plone/buildout.coredev that referenced this pull request Aug 6, 2020
Branch: refs/heads/2.7.x
Date: 2020-08-06T14:53:11+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/mockup@9708a03

backport plone/mockup#1005 to PLone 5.1.x (#1008)

Files changed:
A news/1008.bugfix
M mockup/patterns/structure/js/actionmenu.js
M mockup/patterns/structure/pattern.js
M mockup/tests/pattern-structure-test.js
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.

ContentType should not be used as default page for folder
4 participants