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

. Fix for AWC-661 - you can no longer paste a link as a link (yes that's just weird)

Browse Source 
. Link file/folder external destination link no longer shown in portal mode (external access URLs don't work in a portal)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2951 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-05-23 11:20:53 +00:00
parent cc14120cdf
commit 197078d672
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/web/bean/NavigationBean.java
View File

@@ -130,6 +130,14 @@ public class NavigationBean
return Application.getCurrentUser(FacesContext.getCurrentInstance()); return Application.getCurrentUser(FacesContext.getCurrentInstance());
} }
/**
* @return true if the system is running within a JSR-168 portal container
*/
public boolean getInPortalServer()
{
return Application.inPortalServer();
}
/** /**
* Return the expanded state of the Shelf panel wrapper component * Return the expanded state of the Shelf panel wrapper component
* *

2
source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java
View File

@@ -200,7 +200,7 @@ public class UIClipboardShelfItem extends UIShelfItem
out.write(buildActionLink(ACTION_REMOVE_ITEM, i, bundle.getString(MSG_REMOVE_ITEM), WebResources.IMAGE_REMOVE)); out.write(buildActionLink(ACTION_REMOVE_ITEM, i, bundle.getString(MSG_REMOVE_ITEM), WebResources.IMAGE_REMOVE));
out.write(" "); out.write(" ");
out.write(buildActionLink(ACTION_PASTE_ITEM, i, bundle.getString(MSG_PASTE_ITEM), WebResources.IMAGE_PASTE)); out.write(buildActionLink(ACTION_PASTE_ITEM, i, bundle.getString(MSG_PASTE_ITEM), WebResources.IMAGE_PASTE));
if (item.Mode == ClipboardStatus.COPY) if (item.Mode == ClipboardStatus.COPY && dd.isSubClass(item.Node.getType(), ContentModel.TYPE_LINK) == false)
{ {
out.write(" "); out.write(" ");
out.write(buildActionLink(ACTION_PASTE_LINK, i, bundle.getString(MSG_PASTE_LINK), WebResources.IMAGE_PASTE_LINK)); out.write(buildActionLink(ACTION_PASTE_LINK, i, bundle.getString(MSG_PASTE_LINK), WebResources.IMAGE_PASTE_LINK));

2
source/web/jsp/dialog/filelink-details.jsp
View File

@@ -134,11 +134,13 @@
<a href='<a:outputText value="#{DocumentDetailsBean.nodeRefUrl}" id="out3" />' onclick="return false;"><a:outputText value="#{msg.noderef_link}" id="out4" /></a> <a href='<a:outputText value="#{DocumentDetailsBean.nodeRefUrl}" id="out3" />' onclick="return false;"><a:outputText value="#{msg.noderef_link}" id="out4" /></a>
</td> </td>
</tr> </tr>
<a:panel id="link-panel" rendered="#{NavigationBean.inPortalServer == false}">
<tr> <tr>
<td colspan=3> <td colspan=3>
<a href='<%=request.getContextPath()%><a:outputText value="#{LinkPropertiesBean.fileLinkBookmarkUrl}" id="out5" />'><a:outputText value="#{msg.link_destination_details}" id="out6" /></a> <a href='<%=request.getContextPath()%><a:outputText value="#{LinkPropertiesBean.fileLinkBookmarkUrl}" id="out5" />'><a:outputText value="#{msg.link_destination_details}" id="out6" /></a>
</td> </td>
</tr> </tr>
</a:panel>
</table> </table>
</a:panel> </a:panel>

2
source/web/jsp/dialog/spacelink-details.jsp
View File

@@ -122,11 +122,13 @@
<a href='<a:outputText value="#{SpaceDetailsBean.nodeRefUrl}" id="out3" />' onclick="return false;"><a:outputText value="#{msg.noderef_link}" id="out4" /></a> <a href='<a:outputText value="#{SpaceDetailsBean.nodeRefUrl}" id="out3" />' onclick="return false;"><a:outputText value="#{msg.noderef_link}" id="out4" /></a>
</td> </td>
</tr> </tr>
<a:panel id="link-panel" rendered="#{NavigationBean.inPortalServer == false}">
<tr> <tr>
<td colspan=4> <td colspan=4>
<a href='<%=request.getContextPath()%><a:outputText value="#{LinkPropertiesBean.spaceLinkDestinationUrl}" id="out5" />'><a:outputText value="#{msg.link_destination_details}" id="out6" /></a> <a href='<%=request.getContextPath()%><a:outputText value="#{LinkPropertiesBean.spaceLinkDestinationUrl}" id="out5" />'><a:outputText value="#{msg.link_destination_details}" id="out6" /></a>
</td> </td>
</tr> </tr>
</a:panel>
</table> </table>
</a:panel> </a:panel>