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

CCM NG/ccm-cms: Moving/Copying items. 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4619 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2017-03-03 15:26:33 +00:00
parent 12431ce378
commit 02f54935b8
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderManipulator.java
View File

@ -740,7 +740,7 @@ public class FolderManipulator extends SimpleContainer implements
final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final FolderManager folderManager = cdiUtil.findBean( final FolderManager folderManager = cdiUtil.findBean(
FolderManager.class); FolderManager.class);
if (folder.getParentFolder() == null) { if (!folderManager.getParentFolder(folder).isPresent()) {
folderTree.expand(Long.toString(folder.getObjectId()), folderTree.expand(Long.toString(folder.getObjectId()),
state); state);
} else { } else {
@ -763,7 +763,7 @@ public class FolderManipulator extends SimpleContainer implements
} }
public Folder getTarget(final PageState state) { public Folder getTarget(final PageState state) {
return (Folder) targetModel.getSelectedObject(state); return targetModel.getSelectedObject(state);
} }
public boolean isCancelled(final PageState state) { public boolean isCancelled(final PageState state) {

2
ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java
View File

@ -160,8 +160,6 @@ public class CategoryManager {
// by executing CategoryRepository#save(Category) as the system user. // by executing CategoryRepository#save(Category) as the system user.
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
entityManager.persist(categorization); entityManager.persist(categorization);
// categoryRepo.save(assignedCategory);
// ccmObjectRepo.save(addedObject);
}); });
} }