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 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4734 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4751 .
   Ignored 4672, 4676 in accordance with Roy's checkin notices
   4735 appeared to be already in HEAD


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4760 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-01-09 10:21:49 +00:00
parent acb2cedf0c
commit 844e8b2e70
1 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
View File

@@ -151,33 +151,8 @@ public class ActionLinkRenderer extends BaseRenderer
} }
linkBuf.append(href); linkBuf.append(href);
// append arguments if specified // append the href params if any are present
Map<String, String> actionParams = getParameterComponents(link); renderHrefParams(link, linkBuf, href);
if (actionParams != null)
{
boolean first = (href.indexOf('?') == -1);
for (String name : actionParams.keySet())
{
String paramValue = actionParams.get(name);
if (first)
{
linkBuf.append('?');
first = false;
}
else
{
linkBuf.append('&');
}
try
{
linkBuf.append(name).append("=").append(URLEncoder.encode(paramValue, "UTF-8"));
}
catch (UnsupportedEncodingException err)
{
// if this happens we have bigger problems than a missing URL parameter...!
}
}
}
linkBuf.append('"'); linkBuf.append('"');
@@ -288,6 +263,42 @@ public class ActionLinkRenderer extends BaseRenderer
return linkHtml; return linkHtml;
} }
/**
* @param link
* @param linkBuf
* @param href
*/
private void renderHrefParams(UIActionLink link, StringBuilder linkBuf, String href)
{
// append arguments if specified
Map<String, String> actionParams = getParameterComponents(link);
if (actionParams != null)
{
boolean first = (href.indexOf('?') == -1);
for (String name : actionParams.keySet())
{
String paramValue = actionParams.get(name);
if (first)
{
linkBuf.append('?');
first = false;
}
else
{
linkBuf.append('&');
}
try
{
linkBuf.append(name).append("=").append(URLEncoder.encode(paramValue, "UTF-8"));
}
catch (UnsupportedEncodingException err)
{
// if this happens we have bigger problems than a missing URL parameter...!
}
}
}
}
/** /**
* Render ActionLink as menu image and item link * Render ActionLink as menu image and item link
* *
@@ -339,8 +350,12 @@ public class ActionLinkRenderer extends BaseRenderer
href = context.getExternalContext().getRequestContextPath() + href; href = context.getExternalContext().getRequestContextPath() + href;
} }
buf.append("<a href=\"") buf.append("<a href=\"")
.append(href) .append(href);
.append('"');
// append the href params if any are present
renderHrefParams(link, buf, href);
buf.append('"');
// output href 'target' attribute if supplied // output href 'target' attribute if supplied
if (link.getTarget() != null) if (link.getTarget() != null)