diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 9701f13975..e6fcec3db6 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -736,6 +736,7 @@ preview_of=Preview of modify_props_of=Modify Properties of modify_space_properties=Modify Space Properties modify_content_properties=Modify Content Properties +modify_link_properties=Modify Link Properties view_content_properties=View Content Properties preview=Preview in Template custom_view=Custom View diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml index 65890cb62d..7e217b4fe2 100644 --- a/config/alfresco/web-client-config-actions.xml +++ b/config/alfresco/web-client-config-actions.xml @@ -777,6 +777,12 @@ #{NavigatorPluginBean.reset} + + reset_categories + /images/icons/reset.gif + #{CategoryBrowserPluginBean.reset} + + @@ -1169,6 +1175,10 @@ + + + + diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml index e1c06e6e20..6866b752db 100644 --- a/config/alfresco/web-client-config-dialogs.xml +++ b/config/alfresco/web-client-config-dialogs.xml @@ -373,7 +373,7 @@ description-id="remove_invited_user_info" /> diff --git a/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java b/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java index 0c31748590..f768655d5c 100644 --- a/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java +++ b/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java @@ -60,6 +60,15 @@ public class LinkPropertiesDialog extends BaseDialogBean private Node editableNode = null; + @Override + public void init(Map parameters) + { + super.init(parameters); + + // reset node instance for next dialog invocation + this.editableNode = null; + } + public Map getProperties() { return getEditableNode().getProperties(); diff --git a/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java b/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java index e0e13006e1..d240cd7108 100644 --- a/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java +++ b/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java @@ -466,8 +466,15 @@ public class AdminNodeBrowseBean implements Serializable { if (assocs == null) { - List assocRefs = getNodeService().getTargetAssocs(getNodeRef(), RegexQNamePattern.MATCH_ALL); - assocs = new ListDataModel(assocRefs); + try + { + List assocRefs = getNodeService().getTargetAssocs(getNodeRef(), RegexQNamePattern.MATCH_ALL); + assocs = new ListDataModel(assocRefs); + } + catch (UnsupportedOperationException err) + { + // some stores do not support associations + } } return assocs; } diff --git a/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java b/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java index 103f98609a..b041a1b9e8 100644 --- a/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java @@ -54,6 +54,7 @@ import org.alfresco.service.namespace.QName; import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.web.app.Application; import org.alfresco.web.app.servlet.DownloadContentServlet; +import org.alfresco.web.bean.BrowseBean; import org.alfresco.web.bean.repository.MapNode; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Repository; @@ -88,6 +89,9 @@ public class VersionedDocumentDetailsDialog implements Serializable /** The multilingual information of the selected version selected by the user */ private Version documentEdition; private VersionHistory editionHistory; + + /** Common property resolvers accessed from the BrowseBean */ + private BrowseBean browseBean; public void init() @@ -98,6 +102,14 @@ public class VersionedDocumentDetailsDialog implements Serializable documentEdition = null; editionHistory = null; } + + /** + * @param browseBean The BrowseBean to set. + */ + public void setBrowseBean(BrowseBean browseBean) + { + this.browseBean = browseBean; + } /** * Set which version of the current node that the user want to display the properties @@ -364,17 +376,21 @@ public class VersionedDocumentDetailsDialog implements Serializable return DownloadContentServlet.generateBrowserURL(getFrozenStateNodeRef(), getName()); } - /** - * @return the versioned node selected by the user - */ + /** + * @return the versioned node selected by the user + */ public Node getFrozenStateDocument() { - return new Node(getFrozenStateNodeRef()); + Node node = new Node(getFrozenStateNodeRef()); + node.addPropertyResolver("mimetype", this.browseBean.resolverMimetype); + node.addPropertyResolver("encoding", this.browseBean.resolverEncoding); + node.addPropertyResolver("size", this.browseBean.resolverSize); + return node; } - /** - * @return the versioned node ref selected by the user - */ + /** + * @return the versioned node ref selected by the user + */ public NodeRef getFrozenStateNodeRef() { return documentVersion.getFrozenStateNodeRef(); diff --git a/source/java/org/alfresco/web/bean/wcm/DeploymentServerConfig.java b/source/java/org/alfresco/web/bean/wcm/DeploymentServerConfig.java index b820e077ca..619a59bb81 100644 --- a/source/java/org/alfresco/web/bean/wcm/DeploymentServerConfig.java +++ b/source/java/org/alfresco/web/bean/wcm/DeploymentServerConfig.java @@ -138,7 +138,14 @@ public final class DeploymentServerConfig implements Serializable if (this.props.get(PROP_PORT) != null && ((String)this.props.get(PROP_PORT)).length() > 0) { - repoProps.put(WCMAppModel.PROP_DEPLOYSERVERPORT, new Integer((String)this.props.get(PROP_PORT))); + try + { + repoProps.put(WCMAppModel.PROP_DEPLOYSERVERPORT, new Integer((String)this.props.get(PROP_PORT))); + } + catch (NumberFormatException ne) + { + // ignore invalid numbers + } } if (this.props.get(PROP_NAME) != null && ((String)this.props.get(PROP_NAME)).length() > 0) diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java b/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java index b025c7aca2..d45c9b1dff 100644 --- a/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java +++ b/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java @@ -203,13 +203,13 @@ public class UIDeploymentServers extends UIInput String displayGroup = (String)server.getProperties().get(DeploymentServerConfig.PROP_GROUP); if(!currentDisplayGroup.equalsIgnoreCase(displayGroup)) { - // yes title has changed - write out the new displayGroup - out.write("

"); - out.write(Utils.encode(displayGroup)); - out.write("

"); - currentDisplayGroup = displayGroup; - } - + // yes title has changed - write out the new displayGroup + out.write("

"); + out.write(Utils.encode(displayGroup)); + out.write("

"); + currentDisplayGroup = displayGroup; + } + if (currentServer != null && currentServer.getId().equals(server.getId())) { // This is the server in edit mode diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml index 5ff77e73cc..430ae06857 100644 --- a/source/web/WEB-INF/faces-config-beans.xml +++ b/source/web/WEB-INF/faces-config-beans.xml @@ -4949,6 +4949,10 @@ org.alfresco.web.bean.content.VersionedDocumentDetailsDialog session + + browseBean + #{BrowseBean} + versionService #{VersionService} diff --git a/source/web/jsp/wcm/create-web-content-wizard/details.jsp b/source/web/jsp/wcm/create-web-content-wizard/details.jsp index 3752a036e2..0675750775 100644 --- a/source/web/jsp/wcm/create-web-content-wizard/details.jsp +++ b/source/web/jsp/wcm/create-web-content-wizard/details.jsp @@ -44,7 +44,7 @@ function checkButtonState() { - if (document.getElementById("wizard:wizard-body:name").value.length == 0 ) + if (document.getElementById("wizard:wizard-body:name").value.trim().length == 0) { document.getElementById("wizard:next-button").disabled = true; document.getElementById("wizard:finish-button").disabled = true;