From 90d417a6a977312489c7e755b43381d53ec1c477 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 4 Feb 2015 07:43:30 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)    95988:
 Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)       94475: Merged DEV to
 5.0.N (5.0.1).          94140: MNT-13010: CIFS: CIFS desktop action
 ShowDetails is absent.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/desktop/showDetails.js                       | 3 +--
 .../subsystems/fileServers/default/file-servers-context.xml  | 4 ++--
 .../java/org/alfresco/filesys/alfresco/AlfrescoContext.java  | 5 +++++
 source/java/org/alfresco/filesys/alfresco/DesktopAction.java | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/config/alfresco/desktop/showDetails.js b/config/alfresco/desktop/showDetails.js
index 0173a110b3..bc877acca2 100644
--- a/config/alfresco/desktop/showDetails.js
+++ b/config/alfresco/desktop/showDetails.js
@@ -2,8 +2,7 @@
 
 function runAction()
 {
-  var urlStr = webURL + "navigate/showDocDetails/workspace/SpacesStore/" + deskParams.getTarget(0).getNode().getId() +
-    "?ticket=" + deskParams.getTicket();
+  var urlStr = webURL + "page/document-details?nodeRef=" + deskParams.getTarget(0).getNode().getStoreRef() + "/" + deskParams.getTarget(0).getNode().getId();
 
   return urlStr;
 }
diff --git a/config/alfresco/subsystems/fileServers/default/file-servers-context.xml b/config/alfresco/subsystems/fileServers/default/file-servers-context.xml
index 08ab97bfc3..1d58d83a74 100644
--- a/config/alfresco/subsystems/fileServers/default/file-servers-context.xml
+++ b/config/alfresco/subsystems/fileServers/default/file-servers-context.xml
@@ -502,7 +502,7 @@
                            <value>__CheckInOut.exe</value>
                         </property>
                      </bean>
-                     <!-- 
+                     
                      <bean class="org.alfresco.filesys.repo.desk.JavaScriptDesktopAction">
                         <property name="name">
                            <value>JavaScriptURL</value>
@@ -520,7 +520,7 @@
                            <value>copyToTarget</value>
                         </property>
                      </bean>
-                     -->
+
                      <!-- Other desktop actions which may be enabled -->
                      <!--
                         <bean class="org.alfresco.filesys.repo.desk.EchoDesktopAction"> <property name="name">
diff --git a/source/java/org/alfresco/filesys/alfresco/AlfrescoContext.java b/source/java/org/alfresco/filesys/alfresco/AlfrescoContext.java
index 9c005e9554..6b9556a3e4 100644
--- a/source/java/org/alfresco/filesys/alfresco/AlfrescoContext.java
+++ b/source/java/org/alfresco/filesys/alfresco/AlfrescoContext.java
@@ -260,6 +260,11 @@ public abstract class AlfrescoContext extends DiskDeviceContext
     {
         return sysAdminParams.getAlfrescoProtocol() + "://" + sysAdminParams.getAlfrescoHost() + ":" + sysAdminParams.getAlfrescoPort() + "/" + sysAdminParams.getAlfrescoContext() + "/";
     }
+    
+    public final String getShareUrlPrefix()
+    {
+    	return sysAdminParams.getShareProtocol() + "://" + sysAdminParams.getShareHost() + ":" + sysAdminParams.getSharePort() + "/" + sysAdminParams.getShareContext() + "/";
+    }
 
     /**
      * Return the URL pseudo file name
diff --git a/source/java/org/alfresco/filesys/alfresco/DesktopAction.java b/source/java/org/alfresco/filesys/alfresco/DesktopAction.java
index 388d892846..7e1ea733f3 100644
--- a/source/java/org/alfresco/filesys/alfresco/DesktopAction.java
+++ b/source/java/org/alfresco/filesys/alfresco/DesktopAction.java
@@ -439,7 +439,7 @@ public abstract class DesktopAction {
         SysAdminParams sysAdminParams = m_filesysContext.getSysAdminParams();
         if (m_webappURL == null || m_webappURL.length() == 0)
         {
-            m_webappURL = m_filesysContext.getURLPrefix();
+            m_webappURL = m_filesysContext.getShareUrlPrefix();
         }
         else
         {