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

CCM NG/ccm-cms: Trying to get FolderBrowser working... 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4559 8810af33-2d31-482b-a856-94f89814c4df
ccm-docs
jensp 2017-02-09 11:20:12 +00:00
parent 6038962f6a
commit 1dd30646b3
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-cms/src/main/java/com/arsdigita/cms/ui/FlatItemList.java
View File

@ -347,13 +347,21 @@ public class FlatItemList extends SegmentedPanel implements FormProcessListener,
if (!newItem) { if (!newItem) {
browseMode(state); browseMode(state);
} }
createFolderAction.setVisible(state, newItem);
newItemForm.setVisible(state, newItem); browseSegment.setVisible(state, true);
// newItemSegment.setVisible(state, newItem);
// newFolderSegment.setVisible(state, newItem);
//newItemForm.setVisible(state, newItem);
final boolean editItem = permissionChecker.isPermitted( final boolean editItem = permissionChecker.isPermitted(
ItemPrivileges.EDIT, folder); ItemPrivileges.EDIT, folder);
editFolderAction.setVisible(state, editItem); editFolderAction.setVisible(state, editItem);
chooseLabel.setVisible(state, editItem);
editFolderSegment.setVisible(state, editItem);
if (permissionChecker.isPermitted(ItemPrivileges.ADMINISTER, folder)) { if (permissionChecker.isPermitted(ItemPrivileges.ADMINISTER, folder)) {
permissionsSegment.setVisible(state, true); permissionsSegment.setVisible(state, true);

2
ccm-cms/src/main/java/com/arsdigita/cms/ui/category/IndexItemSelectionForm.java
View File

@ -119,7 +119,7 @@ public class IndexItemSelectionForm extends CMSForm {
for (Categorization child : children) { for (Categorization child : children) {
ContentItem item = (ContentItem) child.getCategorizedObject(); ContentItem item = (ContentItem) child.getCategorizedObject();
Link link = new Link( Link link = new Link(
item.getDisplayName(), new Text(item.getDisplayName()),
itemResolver.generateItemURL( itemResolver.generateItemURL(
state, state,
item.getObjectId(), item.getObjectId(),

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

@ -22,13 +22,11 @@ import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.cms.ItemSelectionModel;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
import java.math.BigDecimal;
public class FolderCreator extends FolderForm { public class FolderCreator extends FolderForm {
@ -44,7 +42,7 @@ public class FolderCreator extends FolderForm {
final FolderSelectionModel model = getFolderSelectionModel(); final FolderSelectionModel model = getFolderSelectionModel();
// Create a new item_id and set it as the key // Create a new item_id and set it as the key
model.setSelectedKey(state, -1L); model.setSelectedKey(state, null);
} }
@Override @Override