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.

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

LPS-184639, LPS-184640, LPS-190570 Add a new table to map each folder id with its Permission Template settings #4997

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
# apps/on-demand-admin,\
# apps/organizations,\
# apps/password-policies-admin,\
# apps/permission-template,\
# apps/plugins-admin,\
# apps/portal,\
# apps/portal-background-task,\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dependencies {
compileOnly project(":apps:change-tracking:change-tracking-store-api")
compileOnly project(":apps:journal:journal-api")
compileOnly project(":apps:json-storage:json-storage-api")
compileOnly project(":apps:permission-template:permission-template-api")
compileOnly project(":apps:portal-background-task:portal-background-task-api")
compileOnly project(":apps:portal-search:portal-search-api")
compileOnly project(":apps:portal-search:portal-search-spi")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/**
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package com.liferay.change.tracking.internal.spi.reference;

import com.liferay.change.tracking.spi.reference.TableReferenceDefinition;
import com.liferay.change.tracking.spi.reference.builder.ChildTableReferenceInfoBuilder;
import com.liferay.change.tracking.spi.reference.builder.ParentTableReferenceInfoBuilder;
import com.liferay.permission.template.model.PermissionTemplate;
import com.liferay.permission.template.model.PermissionTemplateTable;
import com.liferay.permission.template.service.persistence.PermissionTemplatePersistence;
import com.liferay.portal.kernel.service.persistence.BasePersistence;

import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;

/**
* @author Quan Huynh
*/
@Component(service = TableReferenceDefinition.class)
public class PermissionTemplateTableReferenceDefinition
implements TableReferenceDefinition<PermissionTemplateTable> {

@Override
public void defineChildTableReferences(
ChildTableReferenceInfoBuilder<PermissionTemplateTable>
childTableReferenceInfoBuilder) {

childTableReferenceInfoBuilder.resourcePermissionReference(
PermissionTemplateTable.INSTANCE.permissionTemplateId,
PermissionTemplate.class);
}

@Override
public void defineParentTableReferences(
ParentTableReferenceInfoBuilder<PermissionTemplateTable>
parentTableReferenceInfoBuilder) {
}

@Override
public BasePersistence<?> getBasePersistence() {
return _permissionTemplatePersistence;
}

@Override
public PermissionTemplateTable getTable() {
return PermissionTemplateTable.INSTANCE;
}

@Reference
private PermissionTemplatePersistence _permissionTemplatePersistence;

}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies {
compileOnly project(":apps:layout:layout-page-template-api")
compileOnly project(":apps:learn:learn-api")
compileOnly project(":apps:oauth2-provider:oauth2-provider-api")
compileOnly project(":apps:permission-template:permission-template-api")
compileOnly project(":apps:portal-background-task:portal-background-task-api")
compileOnly project(":apps:portal-configuration:portal-configuration-module-configuration-api")
compileOnly project(":apps:portal-search:portal-search-api")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/**
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package com.liferay.change.tracking.web.internal.spi.display;

import com.liferay.change.tracking.spi.display.BaseCTDisplayRenderer;
import com.liferay.change.tracking.spi.display.CTDisplayRenderer;
import com.liferay.permission.template.model.PermissionTemplate;
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.model.ClassName;
import com.liferay.portal.kernel.security.permission.ResourceActions;
import com.liferay.portal.kernel.service.ClassNameLocalService;

import java.util.Locale;

import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;

/**
* @author Quan Huynh
*/
@Component(service = CTDisplayRenderer.class)
public class PermissionTemplateCTDisplayRenderer
extends BaseCTDisplayRenderer<PermissionTemplate> {

@Override
public Class<PermissionTemplate> getModelClass() {
return PermissionTemplate.class;
}

@Override
public String getTitle(
Locale locale, PermissionTemplate permissionTemplate) {

ClassName className = _classNameLocalService.fetchClassName(
permissionTemplate.getClassNameId());

if (className == null) {
return null;
}

return _language.format(
locale, "x-for-x",
new String[] {
_resourceActions.getModelResourceNamePrefix() +
PermissionTemplate.class.getName(),
_resourceActions.getModelResource(
locale, className.getClassName())
});
}

@Override
public boolean isHideable(PermissionTemplate permissionTemplate) {
return true;
}

@Override
protected void buildDisplay(
DisplayBuilder<PermissionTemplate> displayBuilder) {

PermissionTemplate permissionTemplate = displayBuilder.getModel();

displayBuilder.display(
"permission-template-enabled",
permissionTemplate.isPermissionTemplateEnabled());
}

@Reference
private ClassNameLocalService _classNameLocalService;

@Reference
private Language _language;

@Reference
private ResourceActions _resourceActions;

}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies {
compileOnly project(":apps:export-import:export-import-api")
compileOnly project(":apps:friendly-url:friendly-url-api")
compileOnly project(":apps:info:info-api")
compileOnly project(":apps:permission-template:permission-template-api")
compileOnly project(":apps:portal-configuration:portal-configuration-module-configuration-api")
compileOnly project(":apps:portal-configuration:portal-configuration-upgrade-api")
compileOnly project(":apps:portal-search:portal-search-api")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.liferay.document.library.kernel.model.DLFolder;
import com.liferay.document.library.kernel.model.DLFolderTable;
import com.liferay.document.library.kernel.service.persistence.DLFolderPersistence;
import com.liferay.permission.template.model.PermissionTemplateTable;
import com.liferay.portal.kernel.service.persistence.BasePersistence;

import org.osgi.service.component.annotations.Component;
Expand All @@ -33,6 +34,9 @@ public void defineChildTableReferences(
DLFolderTable.INSTANCE.folderId, DLFolder.class
).resourcePermissionReference(
DLFolderTable.INSTANCE.folderId, DLFolder.class
).singleColumnReference(
DLFolderTable.INSTANCE.folderId,
PermissionTemplateTable.INSTANCE.classPK
);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/**
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package com.liferay.document.library.internal.service;

import com.liferay.document.library.kernel.model.DLFolder;
import com.liferay.document.library.kernel.service.DLFolderLocalServiceWrapper;
import com.liferay.permission.template.service.PermissionTemplateLocalService;
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
import com.liferay.portal.kernel.service.ServiceContext;
import com.liferay.portal.kernel.service.ServiceWrapper;
import com.liferay.portal.kernel.util.ParamUtil;

import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;

/**
* @author Loc Pham
*/
@Component(service = ServiceWrapper.class)
public class PermissionTemplateDLFolderLocalServiceWrapper
extends DLFolderLocalServiceWrapper {

@Override
public DLFolder addFolder(
String externalReferenceCode, long userId, long groupId,
long repositoryId, boolean mountPoint, long parentFolderId,
String name, String description, boolean hidden,
ServiceContext serviceContext)
throws PortalException {

DLFolder folder = super.addFolder(
externalReferenceCode, userId, groupId, repositoryId, mountPoint,
parentFolderId, name, description, hidden, serviceContext);

if (FeatureFlagManagerUtil.isEnabled("LPS-87806")) {
_permissionTemplateLocalService.addPermissionTemplate(
folder.getCompanyId(), groupId, DLFolder.class.getName(),
folder.getFolderId(),
ParamUtil.getBoolean(
serviceContext, "permissionTemplateEnabled"));
}

return folder;
}

@Reference
private PermissionTemplateLocalService _permissionTemplateLocalService;

}
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ dependencies {
compileOnly project(":apps:layout:layout-page-template-api")
compileOnly project(":apps:learn:learn-api")
compileOnly project(":apps:learn:learn-taglib")
compileOnly project(":apps:permission-template:permission-template-api")
compileOnly project(":apps:portal-configuration:portal-configuration-module-configuration-api")
compileOnly project(":apps:portal-workflow:portal-workflow-api")
compileOnly project(":apps:portal-workflow:portal-workflow-taglib")
Expand Down
3 changes: 3 additions & 0 deletions modules/apps/permission-template/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.gradle/
build/
target/
15 changes: 15 additions & 0 deletions modules/apps/permission-template/app.bnd
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Liferay-Releng-App-Description:
Liferay-Releng-App-Title: ${liferay.releng.app.title.prefix} Permission Template
Liferay-Releng-Bundle: true
Liferay-Releng-Category: Communication
Liferay-Releng-Demo-Url:
Liferay-Releng-Deprecated: false
Liferay-Releng-Fix-Delivery-Method: core
Liferay-Releng-Labs: false
Liferay-Releng-Marketplace: true
Liferay-Releng-Portal-Required: true
Liferay-Releng-Public: ${liferay.releng.public}
Liferay-Releng-Restart-Required: true
Liferay-Releng-Suite: collaboration
Liferay-Releng-Support-Url: http://www.liferay.com
Liferay-Releng-Supported: ${liferay.releng.supported}
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Bundle-Name: Liferay Permission Template API
Bundle-SymbolicName: com.liferay.permission.template.api
Bundle-Version: 1.0.0
Export-Package:\
com.liferay.permission.template.exception,\
com.liferay.permission.template.model,\
com.liferay.permission.template.service,\
com.liferay.permission.template.service.persistence
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dependencies {
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":core:petra:petra-function")
compileOnly project(":core:petra:petra-sql-dsl-api")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/**
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package com.liferay.permission.template.exception;

import com.liferay.portal.kernel.exception.NoSuchModelException;

/**
* @author Brian Wing Shun Chan
*/
public class NoSuchPermissionTemplateException extends NoSuchModelException {

public NoSuchPermissionTemplateException() {
}

public NoSuchPermissionTemplateException(String msg) {
super(msg);
}

public NoSuchPermissionTemplateException(String msg, Throwable throwable) {
super(msg, throwable);
}

public NoSuchPermissionTemplateException(Throwable throwable) {
super(throwable);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/**
* SPDX-FileCopyrightText: (c) 2023 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package com.liferay.permission.template.model;

import com.liferay.portal.kernel.annotation.ImplementationClassName;
import com.liferay.portal.kernel.model.PersistedModel;
import com.liferay.portal.kernel.util.Accessor;

import org.osgi.annotation.versioning.ProviderType;

/**
* The extended model interface for the PermissionTemplate service. Represents a row in the &quot;PermissionTemplate&quot; database table, with each column mapped to a property of this class.
*
* @author Brian Wing Shun Chan
* @see PermissionTemplateModel
* @generated
*/
@ImplementationClassName(
"com.liferay.permission.template.model.impl.PermissionTemplateImpl"
)
@ProviderType
public interface PermissionTemplate
extends PermissionTemplateModel, PersistedModel {

/*
* NOTE FOR DEVELOPERS:
*
* Never modify this interface directly. Add methods to <code>com.liferay.permission.template.model.impl.PermissionTemplateImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
*/
public static final Accessor<PermissionTemplate, Long>
PERMISSION_TEMPLATE_ID_ACCESSOR =
new Accessor<PermissionTemplate, Long>() {

@Override
public Long get(PermissionTemplate permissionTemplate) {
return permissionTemplate.getPermissionTemplateId();
}

@Override
public Class<Long> getAttributeClass() {
return Long.class;
}

@Override
public Class<PermissionTemplate> getTypeClass() {
return PermissionTemplate.class;
}

};

}
Loading