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.

Sign up for GitHub

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

Jump to bottom

respect default_page_types in actionmenu if folder_contents #1005

Merged
merged 4 commits into from
Aug 3, 2020
Merged

respect default_page_types in actionmenu if folder_contents #1005

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95e9935
respect default_page_types in actionmenu if folder_contents.
pbauer Jul 30, 2020
e30ed56
add changelog
pbauer Jul 30, 2020
7939873
fix tests
pbauer Aug 3, 2020
9c3e9bf
fix more tests
pbauer Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mockup/patterns/structure/js/actionmenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ define(['underscore', 'translate'], function(_, _t) {
delete result['move-top'];
delete result['move-bottom'];
}
if (model.is_folderish || !app.setDefaultPageUrl) {
if (app.defaultPageTypes.indexOf(model.portal_type) == -1 || !app.setDefaultPageUrl) {
delete result['set-default-page'];
}

Expand Down
10 changes: 9 additions & 1 deletion mockup/patterns/structure/pattern.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ define([
'Blob': '/view'
},

defaultPageTypes: null,
_default_defaultPageTypes: [
'Document',
'Event',
'News Item',
'Collection',
],

collectionConstructor:
'mockup-patterns-structure-url/js/collections/result',

Expand Down Expand Up @@ -187,7 +195,7 @@ define([
May want to consider moving the _default_* values out of the
options object.
*/
var replaceDefaults = ['attributes', 'activeColumns', 'availableColumns', 'buttons', 'typeToViewAction'];
var replaceDefaults = ['attributes', 'activeColumns', 'availableColumns', 'buttons', 'typeToViewAction', 'defaultPageTypes'];
_.each(replaceDefaults, function(idx) {
if (self.options[idx] === null) {
self.options[idx] = self.options['_default_' + idx];
Expand Down
2 changes: 2 additions & 0 deletions news/1005.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Respect default_page_types in actionmenu if folder_contents. Fixes https://github.com/plone/Products.CMFPlone/issues/2700
[pbauer]