LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Some bugfixes for FixItemPermissions tool

master
Jens Pelzetter 2023-07-13 21:14:03 +02:00
parent 7cea45560a
commit edd4727b9a
3 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationFixItemPermissionsController.java
View File

@ -55,8 +55,6 @@ public class ConfigurationFixItemPermissionsController {
@Inject @Inject
private AdminPermissionsChecker adminPermissionsChecker; private AdminPermissionsChecker adminPermissionsChecker;
// @Inject
// private ContentSectionManager sectionManager;
@Inject @Inject
private ContentSectionModel sectionModel; private ContentSectionModel sectionModel;
@ -66,13 +64,9 @@ public class ConfigurationFixItemPermissionsController {
@Inject @Inject
private ContentSectionsUi sectionsUi; private ContentSectionsUi sectionsUi;
// @Inject
// private PermissionManager permissionManager;
//
@Inject @Inject
private FixItemPermissionsTaskManager taskManager; private FixItemPermissionsTaskManager taskManager;
@POST @POST
@Path("/") @Path("/")
@AuthorizationRequired @AuthorizationRequired
@ -93,9 +87,6 @@ public class ConfigurationFixItemPermissionsController {
); );
} }
// fixContentItemPermissions(section.getRootDocumentsFolder());
// fixAssetPermissions(section.getRootAssetsFolder());
taskManager.fixItemPermissions(section); taskManager.fixItemPermissions(section);
return String.format( return String.format(
@ -103,39 +94,4 @@ public class ConfigurationFixItemPermissionsController {
); );
} }
// private void fixContentItemPermissions(final Folder folder) {
// final List<ContentItem> items = folder
// .getObjects()
// .stream()
// .map(Categorization::getCategorizedObject)
// .filter(obj -> obj instanceof ContentItem)
// .map(obj -> (ContentItem) obj)
// .collect(Collectors.toList());
//
// for(final ContentItem item : items) {
// permissionManager.copyPermissions(folder, item, true);
// }
//
// for(final Folder subFolder : folder.getSubFolders()) {
// fixContentItemPermissions(subFolder);
// }
// }
//
// private void fixAssetPermissions(final Folder folder) {
// final List<Asset> assets = folder
// .getObjects()
// .stream()
// .map(Categorization::getCategorizedObject)
// .filter(obj -> obj instanceof Asset)
// .map(obj -> (Asset) obj)
// .collect(Collectors.toList());
//
// for(final Asset asset : assets) {
// permissionManager.copyPermissions(folder, asset, true);
// }
//
// for(final Folder subFolder : folder.getSubFolders()) {
// fixAssetPermissions(subFolder);
// }
// }
} }

9
ccm-cms/src/main/java/org/librecms/ui/contentsections/FixItemPermissionsTaskManager.java
View File

@ -113,10 +113,12 @@ public class FixItemPermissionsTaskManager {
tasks.removeAll( tasks.removeAll(
tasks tasks
.stream() .stream()
.filter(task -> task.getStatus() .filter(
task -> task.getStatus()
== FixItemPermissionsStatus.ERROR == FixItemPermissionsStatus.ERROR
|| task.getStatus() || task.getStatus()
== FixItemPermissionsStatus.FINISHED) == FixItemPermissionsStatus.FINISHED
)
.collect(Collectors.toSet()) .collect(Collectors.toSet())
); );
@ -134,6 +136,7 @@ public class FixItemPermissionsTaskManager {
).handle((task, ex) -> handleTaskResult(task, ex, taskStatus)); ).handle((task, ex) -> handleTaskResult(task, ex, taskStatus));
taskStatus.setStatus(FixItemPermissionsStatus.RUNNING); taskStatus.setStatus(FixItemPermissionsStatus.RUNNING);
tasks.add(taskStatus);
} }
private Object handleTaskResult( private Object handleTaskResult(

2
ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
View File

@ -1033,5 +1033,5 @@ pages.page.details.displayname.edit=Display Name bearbeiten
pages.page.details.dialog.displayname.label=Display Name pages.page.details.dialog.displayname.label=Display Name
contentsection.configuration.fixitemandassetspermissions.title=Berechtigungen reparieren contentsection.configuration.fixitemandassetspermissions.title=Berechtigungen reparieren
contentsection.configuration.fixitemandassetspermissions.description=Repariert die Berechtigungen f\u00fcr Dokumente und Assets contentsection.configuration.fixitemandassetspermissions.description=Repariert die Berechtigungen f\u00fcr Dokumente und Assets
contentsection.configuration.fixitemandassetspermissions.running=Repariere Berechtigungen f\u00fcr Dokumente und Assets contentsection.configuration.fixitemandassetspermissions.running=Repariere Berechtigungen f\u00fcr Dokumente und Assets...
contentsection.configuration.fixitemandassetspermissions.failed=Reparieren der Berechtigungen f\u00fcr Dokumente und Assets fehlgeschlagen. Weitere Informationen im Log. contentsection.configuration.fixitemandassetspermissions.failed=Reparieren der Berechtigungen f\u00fcr Dokumente und Assets fehlgeschlagen. Weitere Informationen im Log.