Merged V3.2 to HEAD

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

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

config/alfresco/web-client-config-actions.xml

@@ -777,6 +777,12 @@
             <action>#{NavigatorPluginBean.reset}</action>
          </action>
 
+         <action id="reset_categories">
+            <label-id>reset_categories</label-id>
+            <image>/images/icons/reset.gif</image>
+            <action>#{CategoryBrowserPluginBean.reset}</action>
+         </action>
+
          <!-- Make a document multilingual -->
          <action id="make_doc_multilingual">
             <permissions>
@@ -1169,6 +1175,10 @@
             <action idref="reset_navigator" />
          </action-group>
 
+         <action-group id="category_plugin_actions">
+            <action idref="reset_categories" />
+         </action-group> 
+
          <!-- Actions for the manage group dialog -->
          <action-group id="group_actions">
             <action idref="create_group" />

config/alfresco/web-client-config-dialogs.xml

@@ -373,7 +373,7 @@
                  description-id="remove_invited_user_info" />
          
          <dialog name="editLinkProperties" page="/jsp/content/edit-link-properties.jsp" managed-bean="LinkPropertiesDialog"
-                 icon="/images/icons/details_large.gif" title-id="modify_props_of" 
+                 icon="/images/icons/details_large.gif" title-id="modify_link_properties" 
                  description-id="editlink_description" />
          
          <dialog name="editUserRoles" page="/jsp/roles/edit-user-roles.jsp" managed-bean="EditUserRolesDialog"

config/alfresco/web-client-config.xml

@@ -310,7 +310,7 @@
             <plugin id="opensearch" label-id="opensearch" description-id="opensearch_desc"
                     page="/jsp/sidebar/opensearch.jsp" />
             <plugin id="category-browser" label-id="category_browser_plugin_label"
-                    description-id="category_browser_plugin_description" 
+                    description-id="category_browser_plugin_description" actions-config-id="category_plugin_actions"
                     page="/jsp/sidebar/category-browser.jsp" />
          </plugins>
          

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<String, String> parameters)
+   {
+      super.init(parameters);
+      
+      // reset node instance for next dialog invocation
+      this.editableNode = null;
+   }
+   
    public Map<String, Object> getProperties()
    {
       return getEditableNode().getProperties();

source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java

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

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;
@@ -89,6 +90,9 @@ public class VersionedDocumentDetailsDialog implements Serializable
     private Version documentEdition;
     private VersionHistory editionHistory;
     
+    /** Common property resolvers accessed from the BrowseBean */
+    private BrowseBean browseBean;
+
 
     public void init()
     {
@@ -99,6 +103,14 @@ public class VersionedDocumentDetailsDialog implements Serializable
         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();

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)

source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java

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

source/web/WEB-INF/faces-config-beans.xml

@@ -4949,6 +4949,10 @@
             org.alfresco.web.bean.content.VersionedDocumentDetailsDialog
       </managed-bean-class>
       <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>browseBean</property-name>
+         <value>#{BrowseBean}</value>
+      </managed-property>
       <managed-property>
          <property-name>versionService</property-name>
          <value>#{VersionService}</value>

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;