diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/mocks.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/mocks.ts
index df4393cf4b0b..24cd9ea0dfac 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/mocks.ts
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/mocks.ts
@@ -152,6 +152,7 @@ export const MOCK_RESPONSE_HEADLESS: DotPageApiResponse = {
inode: '123-i',
canEdit: true,
canRead: true,
+ canSeeRules: true,
contentType: 'htmlpageasset',
canLock: true,
locked: false,
@@ -212,6 +213,7 @@ export const MOCK_RESPONSE_VTL: DotPageApiResponse = {
inode: '123-i',
canEdit: true,
canRead: true,
+ canSeeRules: true,
rendered: 'Hello, World!
',
contentType: 'htmlpageasset',
canLock: true,
@@ -427,6 +429,7 @@ export const PAGE_RESPONSE_BY_LANGUAGE_ID = {
inode: '123',
canEdit: true,
canRead: true,
+ canSeeRules: true,
pageURI: 'index',
liveInode: '1234',
stInode: '12345',
@@ -455,6 +458,7 @@ export const PAGE_RESPONSE_BY_LANGUAGE_ID = {
inode: '123',
canEdit: true,
canRead: true,
+ canSeeRules: true,
pageURI: 'index',
liveInode: '1234',
stInode: '12345',
@@ -483,6 +487,7 @@ export const PAGE_RESPONSE_BY_LANGUAGE_ID = {
inode: '123',
canEdit: true,
canRead: true,
+ canSeeRules: true,
pageURI: 'index',
liveInode: '1234',
stInode: '12345',
@@ -757,6 +762,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
identifier: '123',
canEdit: true,
canRead: true,
+ canSeeRules: true,
pageURI: 'page-one',
canLock: false,
isLocked: true,
@@ -785,6 +791,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
identifier: '123',
canEdit: true,
canRead: true,
+ canSeeRules: true,
pageURI: 'page-one',
canLock: true,
locked: true,
@@ -811,6 +818,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
inode: PAGE_INODE_MOCK,
identifier: '123',
canRead: true,
+ canSeeRules: true,
pageURI: 'page-one',
canEdit: false
},
@@ -836,6 +844,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
inode: PAGE_INODE_MOCK,
identifier: 'i-have-a-running-experiment',
canRead: true,
+ canSeeRules: true,
pageURI: 'page-one',
rendered: 'New Content - Hello World
',
canEdit: true
@@ -862,6 +871,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
inode: PAGE_INODE_MOCK,
identifier: '123',
canRead: true,
+ canSeeRules: true,
pageURI: 'page-one',
rendered: 'New Content - Hello World
',
canEdit: true
@@ -888,6 +898,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
inode: PAGE_INODE_MOCK,
identifier: '123',
canRead: true,
+ canSeeRules: true,
pageURI: 'page-one',
rendered: 'hello world
',
canEdit: true
@@ -914,6 +925,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
inode: PAGE_INODE_MOCK,
identifier: '123',
canRead: true,
+ canSeeRules: true,
pageURI: 'page-one',
canEdit: true
},
@@ -939,6 +951,7 @@ export const UVE_PAGE_RESPONSE_MAP = {
identifier: '123',
canEdit: true,
canRead: true,
+ canSeeRules: true,
pageURI: 'page-one'
},
site: {
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/models.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/models.ts
index 35997aac5ba3..d37c3ea172d1 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/models.ts
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/models.ts
@@ -170,6 +170,7 @@ export interface DotPage {
inode: string;
canEdit: boolean;
canRead: boolean;
+ canSeeRules: boolean;
canLock?: boolean;
locked?: boolean;
lockedBy?: string;
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/store/dot-uve.store.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/store/dot-uve.store.ts
index 429b1a36b45f..e6fb45529b9d 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/store/dot-uve.store.ts
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/store/dot-uve.store.ts
@@ -98,7 +98,8 @@ export const UVEStore = signalStore(
label: 'editema.editor.navbar.rules',
id: 'rules',
href: `rules/${page?.identifier}`,
- isDisabled: !page?.canEdit || !isEnterpriseLicense
+ isDisabled:
+ !page?.canSeeRules || !page?.canEdit || !isEnterpriseLicense
},
{
iconURL: 'experiments',
diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/transform/strategy/PageViewStrategy.java b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/transform/strategy/PageViewStrategy.java
index 9037086d879a..f2c9655242cf 100644
--- a/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/transform/strategy/PageViewStrategy.java
+++ b/dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/transform/strategy/PageViewStrategy.java
@@ -99,6 +99,8 @@ protected Map transform(final HTMLPageAsset page, final Map
<%@ page import="java.util.stream.Collectors" %>
<%@ page import="com.dotcms.publisher.business.PublishQueueElementTransformer" %>
+<%@ page import="com.dotcms.publisher.bundle.bean.Bundle" %>
+<%@ page import="com.dotmarketing.exception.DotDataException" %>
+<%@ page import="com.dotmarketing.util.Logger" %>
+<%@ page import="com.liferay.util.StringPool" %>
+<%@ page import="com.dotcms.publishing.FilterDescriptor" %>
<%@ include file="/html/portlet/ext/contentlet/publishing/init.jsp" %>
<%
final int MAX_ASSETS_TO_SHOW = 3;
@@ -288,6 +293,7 @@
<%= LanguageUtil.get(pageContext, "publisher_Identifier") %> |
+ <%= LanguageUtil.get(pageContext, "Filter") %> |
<%= LanguageUtil.get(pageContext, "publisher_Contents") %> |
<%= LanguageUtil.get(pageContext, "publisher_Status") %> |
<%= LanguageUtil.get(pageContext, "publisher_Date_Entered") %> |
@@ -322,6 +328,18 @@
}
shortBundleId.append("-").append(bundleIdParts[i]);
}
+
+ String filterName = "";
+ try {
+ final Bundle bundle = APILocator.getBundleAPI().getBundleById(c.getBundleId());
+ if ( UtilMethods.isSet(bundle) && UtilMethods.isSet(bundle.getFilterKey()) ) {
+ final FilterDescriptor filterDescriptor =
+ APILocator.getPublisherAPI().getFilterDescriptorByKey(bundle.getFilterKey());
+ filterName = filterDescriptor != null ? filterDescriptor.getTitle() : "";
+ }
+ } catch (DotDataException e) {
+ Logger.error(this, "Error getting bundle id: " + c.getBundleId(), e);
+ }
%>
>
|
@@ -336,7 +354,11 @@
|
<%=shortBundleId.toString()%>
|
- <%--BundleTitle--%>
+ <%--BundleFilter--%>
+
+ <%= filterName %>
+ |
+ <%--BundleContents--%>
<%try{ %>
<% if(bundleAssets.keySet().size()>0){ %>
|