inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
17262: Fix for ETHREEOH-2898: Share Login - using return with auto-complete clears login screen details
   17264: Fix for ETHREEOH-2368 Added category is not visible in "Categories" in Side Bar even after the page is refreshed.
   17266: Merged V3.1 to V3.2
      17265: ETHREEOH-3213 - Error occurs if you try to Configure of Site Wiki dashlet if wiki page name contains russian letters
   17279: Fix for ETHREEOH-3110 - Error page if Add broken number by create(edit) ASR or FSR.
   17281: Fix to unreported error where the NodeBrowser would not display nodes that ...
   17283: ETHREEOH-3037 and ETHREEOH-2158
   17286: Fix for ETHREEOH-3075 Encoding field is displayed as empty on Versioned details page.
   17289: Merged V3.1 to V3.2
      17288: Fix for ETHREEOH-3164 Link Destination (with modify properties of a space link) does ...
   17291: Fix for ETHREEOH-2403 It's possible to create a content with spaces.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-01-14 15:03:17 +00:00
parent f52a94eb01
commit 3bd4252a04
11 changed files with 74 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/web/bean/LinkPropertiesDialog.java
View File

@@ -60,6 +60,15 @@ public class LinkPropertiesDialog extends BaseDialogBean
private Node editableNode = null;
@Override
public void init(Map<String, String> parameters)
{
super.init(parameters);
// reset node instance for next dialog invocation
this.editableNode = null;
}
public Map<String, Object> getProperties()
{
return getEditableNode().getProperties();

11
source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java
View File

@@ -466,8 +466,15 @@ public class AdminNodeBrowseBean implements Serializable
{
if (assocs == null)
{
List<AssociationRef> assocRefs = getNodeService().getTargetAssocs(getNodeRef(), RegexQNamePattern.MATCH_ALL);
assocs = new ListDataModel(assocRefs);
try
{
List<AssociationRef> assocRefs = getNodeService().getTargetAssocs(getNodeRef(), RegexQNamePattern.MATCH_ALL);
assocs = new ListDataModel(assocRefs);
}
catch (UnsupportedOperationException err)
{
// some stores do not support associations
}
}
return assocs;
}

30
source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java
View File

@@ -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();

9
source/java/org/alfresco/web/bean/wcm/DeploymentServerConfig.java
View File

@@ -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)

14
source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java
View File

@@ -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("<p class='mainSubTitle'>");
out.write(Utils.encode(displayGroup));
out.write("</p>");
currentDisplayGroup = displayGroup;
}
// yes title has changed - write out the new displayGroup
out.write("<p class='mainSubTitle'>");
out.write(Utils.encode(displayGroup));
out.write("</p>");
currentDisplayGroup = displayGroup;
}
if (currentServer != null && currentServer.getId().equals(server.getId()))
{
// This is the server in edit mode