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

LPS-71633 Add Layout selector to item selector tabs #48074

Closed
wants to merge 4 commits into from
Closed

LPS-71633 Add Layout selector to item selector tabs #48074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f025082
LPS-71633 Add the LayoutItemSelectorCriterion to the link selector, and
robertoDiaz Mar 31, 2017
aa9c188
LPS-71633 Change the dialog title
ambrinchaudhary Apr 4, 2017
b92384f
LPS-71633 Remove unneded component
ambrinchaudhary Apr 4, 2017
390c914
LPS-71633 Add path to images
ambrinchaudhary Apr 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/apps/collaboration/item-selector/item-selector-editor-configuration/build.gradle
View file
Open in desktop
@@ -1,6 +1,7 @@
dependencies {
provided group: "com.liferay", name: "com.liferay.item.selector.api", version: "2.0.0"
provided group: "com.liferay", name: "com.liferay.item.selector.criteria.api", version: "2.0.0"
provided group: "com.liferay", name: "com.liferay.layout.item.selector.api", version: "1.0.0"
provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0"
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
Expand Down
13 changes: 10 additions & 3 deletions ...m/selector/editor/configuration/internal/DocumentsAndMediaURLEditorConfigContributor.java
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@
import com.liferay.item.selector.ItemSelectorReturnType;
import com.liferay.item.selector.criteria.URLItemSelectorReturnType;
import com.liferay.item.selector.criteria.file.criterion.FileItemSelectorCriterion;
import com.liferay.layout.item.selector.criterion.LayoutItemSelectorCriterion;
import com.liferay.portal.kernel.editor.configuration.EditorConfigContributor;
import com.liferay.portal.kernel.json.JSONObject;
import com.liferay.portal.kernel.portlet.RequestBackedPortletURLFactory;
Expand Down Expand Up @@ -52,10 +53,16 @@ public void populateConfigJSONObject(

desiredItemSelectorReturnTypes.add(new URLItemSelectorReturnType());

ItemSelectorCriterion itemSelectorCriterion =
ItemSelectorCriterion fileItemSelectorCriterion =
new FileItemSelectorCriterion();

itemSelectorCriterion.setDesiredItemSelectorReturnTypes(
fileItemSelectorCriterion.setDesiredItemSelectorReturnTypes(
desiredItemSelectorReturnTypes);

ItemSelectorCriterion layoutItemSelectorCriterion =
new LayoutItemSelectorCriterion();

layoutItemSelectorCriterion.setDesiredItemSelectorReturnTypes(
desiredItemSelectorReturnTypes);

String namespace = GetterUtil.getString(
Expand All @@ -67,7 +74,7 @@ public void populateConfigJSONObject(

PortletURL itemSelectorURL = _itemSelector.getItemSelectorURL(
requestBackedPortletURLFactory, namespace + name + "selectItem",
itemSelectorCriterion);
fileItemSelectorCriterion, layoutItemSelectorCriterion);

jsonObject.put("filebrowserBrowseUrl", itemSelectorURL.toString());
}
Expand Down
1 change: 1 addition & 0 deletions .../apps/foundation/frontend-editor/frontend-editor-alloyeditor-link-browse-web/build.gradle
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@ configJSModules {
dependencies {
provided group: "com.liferay", name: "com.liferay.item.selector.api", version: "2.0.0"
provided group: "com.liferay", name: "com.liferay.item.selector.criteria.api", version: "2.0.0"
provided group: "com.liferay", name: "com.liferay.layout.item.selector.api", version: "1.0.0"
provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0"
provided group: "javax.portlet", name: "portlet-api", version: "2.0"
provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
Expand Down
14 changes: 11 additions & 3 deletions ...link/browse/web/internal/editor/configuration/AlloyEditorLinkBrowseConfigContributor.java
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@
import com.liferay.item.selector.ItemSelectorReturnType;
import com.liferay.item.selector.criteria.URLItemSelectorReturnType;
import com.liferay.item.selector.criteria.file.criterion.FileItemSelectorCriterion;
import com.liferay.layout.item.selector.criterion.LayoutItemSelectorCriterion;
import com.liferay.portal.kernel.editor.configuration.BaseEditorConfigContributor;
import com.liferay.portal.kernel.editor.configuration.EditorConfigContributor;
import com.liferay.portal.kernel.json.JSONArray;
Expand Down Expand Up @@ -117,14 +118,21 @@ protected void populateFileBrowserURL(

desiredItemSelectorReturnTypes.add(new URLItemSelectorReturnType());

ItemSelectorCriterion itemSelectorCriterion =
ItemSelectorCriterion fileItemSelectorCriterion =
new FileItemSelectorCriterion();

itemSelectorCriterion.setDesiredItemSelectorReturnTypes(
fileItemSelectorCriterion.setDesiredItemSelectorReturnTypes(
desiredItemSelectorReturnTypes);

LayoutItemSelectorCriterion layoutItemSelectorCriterion =
new LayoutItemSelectorCriterion();

layoutItemSelectorCriterion.setDesiredItemSelectorReturnTypes(
desiredItemSelectorReturnTypes);

PortletURL itemSelectorURL = _itemSelector.getItemSelectorURL(
requestBackedPortletURLFactory, eventName, itemSelectorCriterion);
requestBackedPortletURLFactory, eventName,
fileItemSelectorCriterion, layoutItemSelectorCriterion);

jsonObject.put("documentBrowseLinkUrl", itemSelectorURL.toString());
}
Expand Down
1 change: 1 addition & 0 deletions ...itor-link-browse-web/src/main/resources/META-INF/resources/js/button-link-edit-browse.jsx
View file
Open in desktop
Expand Up @@ -124,6 +124,7 @@
}
}
},
title: Liferay.Language.get('select-item'),
eventName: editor.name + 'selectDocument',
url: url
}
Expand Down
2 changes: 2 additions & 0 deletions ...yout/item/selector/web/internal/display/context/LayoutItemSelectorViewDisplayContext.java
View file
Open in desktop
Expand Up @@ -230,6 +230,8 @@ private JSONArray _getLayoutsJSONArray(
jsonObject.put("layoutId", layout.getLayoutId());
jsonObject.put("name", layout.getName(themeDisplay.getLocale()));
jsonObject.put("privateLayout", layout.isPrivateLayout());
jsonObject.put(
"url", layout.getFriendlyURL(themeDisplay.getLocale()));

if (Objects.equals(layout.getUuid(), selectedLayoutUuid)) {
jsonObject.put("selected", true);
Expand Down
9 changes: 5 additions & 4 deletions ...erience/layout/layout-item-selector-web/src/main/resources/META-INF/resources/layouts.jsp
View file
Open in desktop
Expand Up @@ -36,9 +36,8 @@ Portlet portlet = PortletLocalServiceUtil.getPortletById(company.getCompanyId(),
</aui:fieldset-group>
</aui:form>

<aui:script require="journal-web/js/CardsTreeView.es,metal-dom/src/dom">
<aui:script require="journal-web/js/CardsTreeView.es">
var CardsTreeView = journalWebJsCardsTreeViewEs.default;
var dom = metalDomSrcDom.default;

new CardsTreeView(
{
Expand All @@ -51,7 +50,8 @@ Portlet portlet = PortletLocalServiceUtil.getPortletById(company.getCompanyId(),
id: node.id,
layoutId: node.layoutId,
name: node.value,
privateLayout: node.privateLayout
privateLayout: node.privateLayout,
value: node.url
};

Liferay.Util.getOpener().Liferay.fire(
Expand All @@ -62,7 +62,8 @@ Portlet portlet = PortletLocalServiceUtil.getPortletById(company.getCompanyId(),
);
}
},
nodes: [<%= layoutItemSelectorViewDisplayContext.getLayoutsJSONObject() %>]
nodes: [<%= layoutItemSelectorViewDisplayContext.getLayoutsJSONObject() %>],
pathThemeImages: '<%= themeDisplay.getPathThemeImages() %>'
},
'#<portlet:namespace />displayPageContainer'
);
Expand Down
1 change: 1 addition & 0 deletions portal-impl/src/content/Language.properties
View file
Open in desktop
Expand Up @@ -4100,6 +4100,7 @@ select-file=Select File
select-files=Select Files
select-folder=Select Folder
select-in-x=Select in {0}
select-item=Select Item
select-layout=Select Page
select-list=Select List
select-more-than-one=Select More Than One
Expand Down