From ae9a7dd1fe86f184d87d2fcd5ed12e44fa6e4ffe Mon Sep 17 00:00:00 2001 From: Ambrin Chaudhary Date: Tue, 22 Oct 2024 10:31:04 +0200 Subject: [PATCH 1/6] LPD-39899 Remove hide/show options button under FF --- .../html/taglib/ui/input_permissions/init.jsp | 3 ++- .../html/taglib/ui/input_permissions/page.jsp | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/portal-web/docroot/html/taglib/ui/input_permissions/init.jsp b/portal-web/docroot/html/taglib/ui/input_permissions/init.jsp index 52ab92abcc0119..6dacb7b063feaf 100644 --- a/portal-web/docroot/html/taglib/ui/input_permissions/init.jsp +++ b/portal-web/docroot/html/taglib/ui/input_permissions/init.jsp @@ -7,4 +7,5 @@ <%@ include file="/html/taglib/init.jsp" %> -<%@ page import="com.liferay.taglib.ui.InputPermissionsParamsTag" %> \ No newline at end of file +<%@ page import="com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil" %><%@ +page import="com.liferay.taglib.ui.InputPermissionsParamsTag" %> \ No newline at end of file diff --git a/portal-web/docroot/html/taglib/ui/input_permissions/page.jsp b/portal-web/docroot/html/taglib/ui/input_permissions/page.jsp index a7c3669e12ad64..ea6e6ef6d0317b 100644 --- a/portal-web/docroot/html/taglib/ui/input_permissions/page.jsp +++ b/portal-web/docroot/html/taglib/ui/input_permissions/page.jsp @@ -66,7 +66,7 @@ String modelName = (String)request.getAttribute("liferay-ui:input-permissions:mo boolean submitted = request.getParameter(groupPermissionsName) != null; - boolean inputPermissionsShowOptions = ParamUtil.getBoolean(request, "inputPermissionsShowOptions"); + boolean inputPermissionsShowOptions = FeatureFlagManagerUtil.isEnabled("LPD-19787") || ParamUtil.getBoolean(request, "inputPermissionsShowOptions"); String inputPermissionsViewRole = ParamUtil.getString(request, "inputPermissionsViewRole", InputPermissionsParamsTag.getDefaultViewRole(modelName, themeDisplay)); %> @@ -113,13 +113,15 @@ String modelName = (String)request.getAttribute("liferay-ui:input-permissions:mo - + + - " id="<%= uniqueNamespace %>inputPermissionsShowOptionsHelp"> - - + " id="<%= uniqueNamespace %>inputPermissionsShowOptionsHelp"> + + +

From fcce86ccee5a8a19c89882bb1dc3849e967aa27b Mon Sep 17 00:00:00 2001 From: Ambrin Chaudhary Date: Tue, 22 Oct 2024 11:05:51 +0200 Subject: [PATCH 2/6] LPD-39899 Add FF to portal.properties --- portal-impl/src/portal.properties | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/portal-impl/src/portal.properties b/portal-impl/src/portal.properties index 6778acf846ec05..60a7f73f8980b1 100644 --- a/portal-impl/src/portal.properties +++ b/portal-impl/src/portal.properties @@ -6491,6 +6491,11 @@ # feature.flag.LPD-18221=false + # + # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASED__MINUS__NUMBER1__NUMBER9__NUMBER7__NUMBER8__NUMBER7_ + # + feature.flag.LPD-19787=false + # # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASED__MINUS__NUMBER1__NUMBER9__NUMBER8__NUMBER7__NUMBER0_ # From 0f8f2dbf7f14f9bf38e2001e27f517acfdbd8322 Mon Sep 17 00:00:00 2001 From: Ambrin Chaudhary Date: Tue, 22 Oct 2024 21:27:55 +0200 Subject: [PATCH 3/6] LPD-39898 Change label when Download permission exists --- .../src/main/resources/content/Language.properties | 1 + .../docroot/html/taglib/ui/input_permissions/page.jsp | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/apps/portal-language/portal-language-lang/src/main/resources/content/Language.properties b/modules/apps/portal-language/portal-language-lang/src/main/resources/content/Language.properties index ecef2f3a9074e4..7e266bc5a8f251 100644 --- a/modules/apps/portal-language/portal-language-lang/src/main/resources/content/Language.properties +++ b/modules/apps/portal-language/portal-language-lang/src/main/resources/content/Language.properties @@ -21263,6 +21263,7 @@ view-x=View {0} view-x-options=View {0} Options view-x-usages=View {0} Usages view[action]=View +viewable-and-downloadable-by=Viewable and downloadable by viewable-by=Viewable by viewed-blog=Viewed Blog viewed-document-and-media=Viewed Document & Media diff --git a/portal-web/docroot/html/taglib/ui/input_permissions/page.jsp b/portal-web/docroot/html/taglib/ui/input_permissions/page.jsp index ea6e6ef6d0317b..0a785f88369397 100644 --- a/portal-web/docroot/html/taglib/ui/input_permissions/page.jsp +++ b/portal-web/docroot/html/taglib/ui/input_permissions/page.jsp @@ -76,7 +76,14 @@ String modelName = (String)request.getAttribute("liferay-ui:input-permissions:mo