From 9b838b82c4be10eaaad74619a5a15633f66ae31a Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Thu, 21 Feb 2008 12:31:41 +0000 Subject: [PATCH] Merged V2.2 to HEAD 7410: Node Browser changes git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8350 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/bean/admin/AdminNodeBrowseBean.java | 60 ++++++++++ source/web/css/main.css | 28 ++++- source/web/jsp/admin/admin-title.jsp | 6 +- source/web/jsp/admin/node-browser.jsp | 109 +++++++++++------- source/web/jsp/admin/search-results.jsp | 30 ++--- source/web/jsp/admin/store-browser.jsp | 10 +- 6 files changed, 175 insertions(+), 68 deletions(-) diff --git a/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java b/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java index e38398bbee..9d81760926 100644 --- a/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java +++ b/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java @@ -27,6 +27,7 @@ package org.alfresco.web.bean.admin; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,6 +38,8 @@ import javax.faces.model.ListDataModel; import javax.faces.model.SelectItem; import org.alfresco.error.AlfrescoRuntimeException; +import org.alfresco.repo.domain.PropertyValue; +import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.PropertyDefinition; @@ -99,6 +102,7 @@ public class AdminNodeBrowseBean implements Serializable transient private DataModel assocs = null; private Boolean inheritPermissions = null; transient private DataModel permissions = null; + transient private DataModel avmStoreProps = null; // supporting repository services transient private NodeService nodeService; @@ -106,6 +110,7 @@ public class AdminNodeBrowseBean implements Serializable transient private SearchService searchService; transient private NamespaceService namespaceService; transient private PermissionService permissionService; + transient private AVMService avmService; /** * @param nodeService node service @@ -191,6 +196,23 @@ public class AdminNodeBrowseBean implements Serializable } return permissionService; } + + /** + * @param avmService AVM service + */ + public void setAVMService(AVMService avmService) + { + this.avmService = avmService; + } + + private AVMService getAVMService() + { + if (avmService == null) + { + avmService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getAVMService(); + } + return avmService; + } /** * Gets the list of repository stores @@ -401,6 +423,41 @@ public class AdminNodeBrowseBean implements Serializable } return assocs; } + + public boolean getInAVMStore() + { + return nodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM); + } + + public DataModel getAVMStoreProperties() + { + if (avmStoreProps == null) + { + // work out the store name from current nodeRef + String store = nodeRef.getStoreRef().getIdentifier(); + Map props = getAVMService().getStoreProperties(store); + List> storeProperties = new ArrayList>(); + + for (Map.Entry property : props.entrySet()) + { + Map map = new HashMap(2); + map.put("name", property.getKey().toString()); + map.put("type", property.getValue().getActualType()); + String val = property.getValue().getStringValue(); + if (val == null) + { + val = "null"; + } + map.put("value", val); + + storeProperties.add(map); + } + + avmStoreProps = new ListDataModel(storeProperties); + } + + return avmStoreProps; + } /** * Gets the current query language @@ -472,6 +529,9 @@ public class AdminNodeBrowseBean implements Serializable StoreRef storeRef = (StoreRef)getStores().getRowData(); NodeRef rootNode = getNodeService().getRootNode(storeRef); setNodeRef(rootNode); + + this.avmStoreProps = null; + return "success"; } diff --git a/source/web/css/main.css b/source/web/css/main.css index 21a4404ed5..2c456a1fd3 100644 --- a/source/web/css/main.css +++ b/source/web/css/main.css @@ -1030,6 +1030,32 @@ a.sidebarButtonLink, a.sidebarButtonLink:link, a.sidebarButtonLink:visited clear: both; padding-bottom: 5px; margin-bottom: 5px; +} + +.nodeBrowserForm +{ + border-top: 1px dotted #aaa; + padding: 8px; + margin: 4px 4px 16px 2px; +} + +.nodeBrowserTable +{ + border-collapse: collapse; + border: 1px solid #aaa; + margin-top: 3px; +} + +.nodeBrowserTable th +{ + background-color: #dfe6ed; + font-weight: bold; + padding: 4px; + text-align: left; } - +.nodeBrowserTable td +{ + padding: 3px; +} + diff --git a/source/web/jsp/admin/admin-title.jsp b/source/web/jsp/admin/admin-title.jsp index 11011c6d02..b4d387afe4 100644 --- a/source/web/jsp/admin/admin-title.jsp +++ b/source/web/jsp/admin/admin-title.jsp @@ -22,8 +22,10 @@ * the FLOSS exception, and it is also available here: * http://www.alfresco.com/legal/licensing" --%> + +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> - + @@ -40,5 +42,3 @@
- -
diff --git a/source/web/jsp/admin/node-browser.jsp b/source/web/jsp/admin/node-browser.jsp index ad63c90fad..d72cf6a763 100644 --- a/source/web/jsp/admin/node-browser.jsp +++ b/source/web/jsp/admin/node-browser.jsp @@ -40,13 +40,13 @@ <%@ include file="admin-title.jsp" %> - + -
-
+
+
@@ -73,39 +73,39 @@ - +
- - - - - - - - - - - - - - +
Primary Path: - - - - - -
Reference:
Type:
Parent: - - - -
+ + + + + + + + + + + + +
Primary Path: + + + + + +
Reference:
Type:
Parent: + + + +
-
+
- + @@ -154,7 +154,7 @@ -
+
@@ -163,7 +163,7 @@ -
+
@@ -172,8 +172,7 @@
-
- + @@ -194,10 +193,10 @@ -
+
- + @@ -232,10 +231,10 @@ -
+
- + @@ -253,10 +252,10 @@ -
+
- + @@ -283,7 +282,35 @@ - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/web/jsp/admin/search-results.jsp b/source/web/jsp/admin/search-results.jsp index 1459309041..1d31bbc86a 100644 --- a/source/web/jsp/admin/search-results.jsp +++ b/source/web/jsp/admin/search-results.jsp @@ -40,23 +40,17 @@ <%@ include file="admin-title.jsp" %> - - - - - - -
- - - -  |  - - - -
+ + + + +  |  + + + -
+
+
@@ -68,10 +62,10 @@
-
+
Results ( rows) - + diff --git a/source/web/jsp/admin/store-browser.jsp b/source/web/jsp/admin/store-browser.jsp index 1db9d9280a..e9e3b99897 100644 --- a/source/web/jsp/admin/store-browser.jsp +++ b/source/web/jsp/admin/store-browser.jsp @@ -40,17 +40,17 @@ <%@ include file="admin-title.jsp" %> - + -
-
+
+
-
+
- +