LPD-20520 call the FF method with the companyId

david-truong · Mar 18, 2024 · d8735da · d8735da
1 parent 9dce1f0
commit d8735da
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 17 deletions.
diff --git a/...om/liferay/document/library/web/internal/display/context/DLViewEntriesDisplayContext.java b/...om/liferay/document/library/web/internal/display/context/DLViewEntriesDisplayContext.java
@@ -289,7 +289,9 @@ public String getViewFileEntryURL(FileEntry fileEntry) {
 	}
 
 	public boolean hasApprovedVersion(long fileEntryId) {
-		if (!FeatureFlagManagerUtil.isEnabled("LPD-10701")) {
+		if (!FeatureFlagManagerUtil.isEnabled(
+				_themeDisplay.getCompanyId(), "LPD-10701")) {
+
 			return false;
 		}
 

diff --git a/...document/library/web/internal/display/context/DefaultDLViewFileVersionDisplayContext.java b/...document/library/web/internal/display/context/DefaultDLViewFileVersionDisplayContext.java
@@ -256,7 +256,9 @@ public UUID getUuid() {
 
 	@Override
 	public boolean hasApprovedVersion() {
-		if (!FeatureFlagManagerUtil.isEnabled("LPD-10701")) {
+		if (!FeatureFlagManagerUtil.isEnabled(
+				_fileVersion.getCompanyId(), "LPD-10701")) {
+
 			return false;
 		}
 

diff --git a/...nt-library-web/src/main/resources/META-INF/resources/document_library/edit_file_entry.jsp b/...nt-library-web/src/main/resources/META-INF/resources/document_library/edit_file_entry.jsp
@@ -538,12 +538,12 @@ renderResponse.setTitle(headerTitle);
 					</c:if>
 
 					<c:if test="<%= !RepositoryUtil.isExternalRepository(repositoryId) %>">
-						<aui:fieldset collapsed="<%= true %>" collapsible="<%= true %>" label='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") ? "schedule" : "expiration-date" %>'>
+						<aui:fieldset collapsed="<%= true %>" collapsible="<%= true %>" label='<%= FeatureFlagManagerUtil.isEnabled(themeDisplay.getCompanyId(), "LPD-10701") ? "schedule" : "expiration-date" %>'>
 							<liferay-ui:error exception="<%= FileEntryDisplayDateException.class %>" message="please-enter-a-valid-publish-date" />
 							<liferay-ui:error exception="<%= FileEntryExpirationDateException.class %>" message="please-enter-a-valid-expiration-date" />
 							<liferay-ui:error exception="<%= FileEntryReviewDateException.class %>" message="please-enter-a-valid-review-date" />
 
-							<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") %>'>
+							<c:if test='<%= FeatureFlagManagerUtil.isEnabled(themeDisplay.getCompanyId(), "LPD-10701") %>'>
 								<p class="text-secondary">
 									<liferay-ui:message key="set-the-publication-date-and-time-for-your-document-to-be-published-automatically" />
 								</p>

diff --git a/...t-library-web/src/main/resources/META-INF/resources/document_library/search_resources.jsp b/...t-library-web/src/main/resources/META-INF/resources/document_library/search_resources.jsp
@@ -200,7 +200,7 @@ entriesChecker.setRememberCheckBoxStateURLRegex("^(?!.*" + liferayPortletRespons
 														</div>
 
 														<div class="card-detail">
-															<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") && !latestFileVersion.isApproved() && dlViewFileVersionDisplayContext.hasApprovedVersion() %>'>
+															<c:if test='<%= FeatureFlagManagerUtil.isEnabled(latestFileVersion.getCompanyId(), "LPD-10701") && !latestFileVersion.isApproved() && dlViewFileVersionDisplayContext.hasApprovedVersion() %>'>
 																<liferay-portal-workflow:status
 																	showStatusLabel="<%= false %>"
 																	status="<%= WorkflowConstants.STATUS_APPROVED %>"
@@ -212,7 +212,7 @@ entriesChecker.setRememberCheckBoxStateURLRegex("^(?!.*" + liferayPortletRespons
 																status="<%= latestFileVersion.getStatus() %>"
 															/>
 
-															<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") && latestFileVersion.isScheduled() %>'>
+															<c:if test='<%= FeatureFlagManagerUtil.isEnabled(latestFileVersion.getCompanyId(), "LPD-10701") && latestFileVersion.isScheduled() %>'>
 
 																<%
 																String displayDateString = StringPool.BLANK;
@@ -370,7 +370,7 @@ entriesChecker.setRememberCheckBoxStateURLRegex("^(?!.*" + liferayPortletRespons
 												cssClass="table-cell-expand-smallest"
 												name="status"
 											>
-												<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") && !latestFileVersion.isApproved() && dlViewFileVersionDisplayContext.hasApprovedVersion() %>'>
+												<c:if test='<%= FeatureFlagManagerUtil.isEnabled(latestFileVersion.getCompanyId(), "LPD-10701") && !latestFileVersion.isApproved() && dlViewFileVersionDisplayContext.hasApprovedVersion() %>'>
 													<liferay-portal-workflow:status
 														showStatusLabel="<%= false %>"
 														status="<%= WorkflowConstants.STATUS_APPROVED %>"
@@ -382,7 +382,7 @@ entriesChecker.setRememberCheckBoxStateURLRegex("^(?!.*" + liferayPortletRespons
 													status="<%= latestFileVersion.getStatus() %>"
 												/>
 
-												<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") && latestFileVersion.isScheduled() %>'>
+												<c:if test='<%= FeatureFlagManagerUtil.isEnabled(latestFileVersion.getCompanyId(), "LPD-10701") && latestFileVersion.isScheduled() %>'>
 
 													<%
 													String displayDateString = StringPool.BLANK;

diff --git a/.../resources/META-INF/resources/document_library/upload_multiple_file_entries_resources.jsp b/.../resources/META-INF/resources/document_library/upload_multiple_file_entries_resources.jsp
@@ -381,7 +381,7 @@ else {
 				<liferay-ui:error exception="<%= FileEntryExpirationDateException.class %>" message="please-enter-a-valid-expiration-date" />
 				<liferay-ui:error exception="<%= FileEntryReviewDateException.class %>" message="please-enter-a-valid-review-date" />
 
-				<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") %>'>
+				<c:if test='<%= FeatureFlagManagerUtil.isEnabled(themeDisplay.getCompanyId(), "LPD-10701") %>'>
 					<p class="text-secondary">
 						<liferay-ui:message key="set-the-publication-date-and-time-for-your-document-to-be-published-automatically" />
 					</p>

diff --git a/...ument-library-web/src/main/resources/META-INF/resources/document_library/view_entries.jsp b/...ument-library-web/src/main/resources/META-INF/resources/document_library/view_entries.jsp
@@ -142,7 +142,7 @@ DLViewEntriesDisplayContext dlViewEntriesDisplayContext = new DLViewEntriesDispl
 													</div>
 
 													<div class="card-detail">
-														<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") && !latestFileVersion.isApproved() && dlViewEntriesDisplayContext.hasApprovedVersion(latestFileVersion.getFileEntryId()) %>'>
+														<c:if test='<%= FeatureFlagManagerUtil.isEnabled(latestFileVersion.getCompanyId(), "LPD-10701") && !latestFileVersion.isApproved() && dlViewEntriesDisplayContext.hasApprovedVersion(latestFileVersion.getFileEntryId()) %>'>
 															<liferay-portal-workflow:status
 																showStatusLabel="<%= false %>"
 																status="<%= WorkflowConstants.STATUS_APPROVED %>"
@@ -154,7 +154,7 @@ DLViewEntriesDisplayContext dlViewEntriesDisplayContext = new DLViewEntriesDispl
 															status="<%= latestFileVersion.getStatus() %>"
 														/>
 
-														<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") && latestFileVersion.isScheduled() %>'>
+														<c:if test='<%= FeatureFlagManagerUtil.isEnabled(latestFileVersion.getCompanyId(), "LPD-10701") && latestFileVersion.isScheduled() %>'>
 
 															<%
 															String displayDateString = StringPool.BLANK;
@@ -312,7 +312,7 @@ DLViewEntriesDisplayContext dlViewEntriesDisplayContext = new DLViewEntriesDispl
 											cssClass="table-cell-expand-smallest"
 											name="status"
 										>
-											<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") && !latestFileVersion.isApproved() && dlViewEntriesDisplayContext.hasApprovedVersion(latestFileVersion.getFileEntryId()) %>'>
+											<c:if test='<%= FeatureFlagManagerUtil.isEnabled(latestFileVersion.getCompanyId(), "LPD-10701") && !latestFileVersion.isApproved() && dlViewEntriesDisplayContext.hasApprovedVersion(latestFileVersion.getFileEntryId()) %>'>
 												<liferay-portal-workflow:status
 													showStatusLabel="<%= false %>"
 													status="<%= WorkflowConstants.STATUS_APPROVED %>"
@@ -324,7 +324,7 @@ DLViewEntriesDisplayContext dlViewEntriesDisplayContext = new DLViewEntriesDispl
 												status="<%= latestFileVersion.getStatus() %>"
 											/>
 
-											<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") && latestFileVersion.isScheduled() %>'>
+											<c:if test='<%= FeatureFlagManagerUtil.isEnabled(latestFileVersion.getCompanyId(), "LPD-10701") && latestFileVersion.isScheduled() %>'>
 
 												<%
 												String displayDateString = StringPool.BLANK;

diff --git a/...eb/src/main/resources/META-INF/resources/document_library/view_file_entry_descriptive.jsp b/...eb/src/main/resources/META-INF/resources/document_library/view_file_entry_descriptive.jsp
@@ -103,7 +103,7 @@ else {
 </c:if>
 
 <span class="file-entry-status">
-	<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") && !latestFileVersion.isApproved() && dlViewFileVersionDisplayContext.hasApprovedVersion() %>'>
+	<c:if test='<%= FeatureFlagManagerUtil.isEnabled(latestFileVersion.getCompanyId(), "LPD-10701") && !latestFileVersion.isApproved() && dlViewFileVersionDisplayContext.hasApprovedVersion() %>'>
 		<liferay-portal-workflow:status
 			showStatusLabel="<%= false %>"
 			status="<%= WorkflowConstants.STATUS_APPROVED %>"
@@ -115,7 +115,7 @@ else {
 		status="<%= latestFileVersion.getStatus() %>"
 	/>
 
-	<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-10701") && latestFileVersion.isScheduled() %>'>
+	<c:if test='<%= FeatureFlagManagerUtil.isEnabled(latestFileVersion.getCompanyId(), "LPD-10701") && latestFileVersion.isScheduled() %>'>
 
 		<%
 		String displayDateString = StringPool.BLANK;

diff --git a/...mpl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryLocalServiceImpl.java b/...mpl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryLocalServiceImpl.java
@@ -377,7 +377,7 @@ public void checkFileEntries(long companyId, long checkInterval)
 
 		long userId = _getActiveCompanyAdminUserId(companyId);
 
-		if (FeatureFlagManagerUtil.isEnabled("LPD-10701")) {
+		if (FeatureFlagManagerUtil.isEnabled(companyId, "LPD-10701")) {
 			_checkFileEntriesByDisplayDate(companyId, date, userId);
 		}
 
@@ -1992,7 +1992,9 @@ public DLFileEntry updateStatus(
 
 		int oldStatus = dlFileVersion.getStatus();
 
-		if (FeatureFlagManagerUtil.isEnabled("LPD-10701")) {
+		if (FeatureFlagManagerUtil.isEnabled(
+				dlFileVersion.getCompanyId(), "LPD-10701")) {
+
 			Date date = new Date();
 
 			if ((status == WorkflowConstants.STATUS_APPROVED) &&