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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis
2015-02-04 07:43:30 +00:00
parent 0e93619358
commit 90d417a6a9
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/desktop/showDetails.js
View File

@@ -2,8 +2,7 @@
function runAction() function runAction()
{ {
var urlStr = webURL + "navigate/showDocDetails/workspace/SpacesStore/" + deskParams.getTarget(0).getNode().getId() + var urlStr = webURL + "page/document-details?nodeRef=" + deskParams.getTarget(0).getNode().getStoreRef() + "/" + deskParams.getTarget(0).getNode().getId();
"?ticket=" + deskParams.getTicket();
return urlStr; return urlStr;
} }

4
config/alfresco/subsystems/fileServers/default/file-servers-context.xml
View File

@@ -502,7 +502,7 @@
<value>__CheckInOut.exe</value> <value>__CheckInOut.exe</value>
</property> </property>
</bean> </bean>
<!--
<bean class="org.alfresco.filesys.repo.desk.JavaScriptDesktopAction"> <bean class="org.alfresco.filesys.repo.desk.JavaScriptDesktopAction">
<property name="name"> <property name="name">
<value>JavaScriptURL</value> <value>JavaScriptURL</value>
@@ -520,7 +520,7 @@
<value>copyToTarget</value> <value>copyToTarget</value>
</property> </property>
</bean> </bean>
-->
<!-- Other desktop actions which may be enabled --> <!-- Other desktop actions which may be enabled -->
<!-- <!--
<bean class="org.alfresco.filesys.repo.desk.EchoDesktopAction"> <property name="name"> <bean class="org.alfresco.filesys.repo.desk.EchoDesktopAction"> <property name="name">

5
source/java/org/alfresco/filesys/alfresco/AlfrescoContext.java
View File

@@ -260,6 +260,11 @@ public abstract class AlfrescoContext extends DiskDeviceContext
{ {
return sysAdminParams.getAlfrescoProtocol() + "://" + sysAdminParams.getAlfrescoHost() + ":" + sysAdminParams.getAlfrescoPort() + "/" + sysAdminParams.getAlfrescoContext() + "/"; 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 * Return the URL pseudo file name

2
source/java/org/alfresco/filesys/alfresco/DesktopAction.java
View File

@@ -439,7 +439,7 @@ public abstract class DesktopAction {
SysAdminParams sysAdminParams = m_filesysContext.getSysAdminParams(); SysAdminParams sysAdminParams = m_filesysContext.getSysAdminParams();
if (m_webappURL == null || m_webappURL.length() == 0) if (m_webappURL == null || m_webappURL.length() == 0)
{ {
m_webappURL = m_filesysContext.getURLPrefix(); m_webappURL = m_filesysContext.getShareUrlPrefix();
} }
else else
{ {