From c18a28562f05be6b9e29f75ab36458d32dab6c39 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 9 Feb 2017 11:20:12 +0000
Subject: [PATCH] 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
---
 .../main/java/com/arsdigita/cms/ui/FlatItemList.java | 12 ++++++++++--
 .../cms/ui/category/IndexItemSelectionForm.java      |  2 +-
 .../com/arsdigita/cms/ui/folder/FolderCreator.java   |  4 +---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/FlatItemList.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/FlatItemList.java
index 38e1597a1..4fb7ae1ad 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/FlatItemList.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/FlatItemList.java
@@ -347,13 +347,21 @@ public class FlatItemList extends SegmentedPanel implements FormProcessListener,
         if (!newItem) {
             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(
             ItemPrivileges.EDIT, folder);
 
         editFolderAction.setVisible(state, editItem);
+        chooseLabel.setVisible(state, editItem);
+        editFolderSegment.setVisible(state, editItem);
+        
 
         if (permissionChecker.isPermitted(ItemPrivileges.ADMINISTER, folder)) {
             permissionsSegment.setVisible(state, true);
diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/IndexItemSelectionForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/IndexItemSelectionForm.java
index 0d7ee7f93..5d2e9600d 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/IndexItemSelectionForm.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/IndexItemSelectionForm.java
@@ -119,7 +119,7 @@ public class IndexItemSelectionForm extends CMSForm {
                 for (Categorization child : children) {
                     ContentItem item = (ContentItem) child.getCategorizedObject();
                     Link link = new Link(
-                            item.getDisplayName(),
+                            new Text(item.getDisplayName()),
                             itemResolver.generateItemURL(
                                     state,
                                     item.getObjectId(),
diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderCreator.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderCreator.java
index 29c8db7ba..5ee2c2952 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderCreator.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderCreator.java
@@ -22,13 +22,11 @@ import com.arsdigita.bebop.FormData;
 import com.arsdigita.bebop.FormProcessException;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.FormSectionEvent;
-import com.arsdigita.cms.ItemSelectionModel;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.libreccm.categorization.Category;
 
-import java.math.BigDecimal;
 
 public class FolderCreator extends FolderForm {
 
@@ -44,7 +42,7 @@ public class FolderCreator extends FolderForm {
         final FolderSelectionModel model = getFolderSelectionModel();
 
         // Create a new item_id and set it as the key
-        model.setSelectedKey(state, -1L);
+        model.setSelectedKey(state, null);
     }
 
     @Override