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 ALF-4814 and ALF-2963.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2011-12-20 14:57:28 +00:00
parent 517b52d7d1
commit 408c46456a
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/web/ui/common/renderer/ErrorsRenderer.java
View File

@@ -42,6 +42,9 @@ public class ErrorsRenderer extends BaseRenderer
private static final String DEFAULT_MESSAGE = "wizard_errors"; private static final String DEFAULT_MESSAGE = "wizard_errors";
private static final String ERROR_HINT = "error"; private static final String ERROR_HINT = "error";
private static final String DEFAULT_CSS_INFO = "statusInfoText";
private static final String DEFAULT_CSS_ERROR = "statusErrorText";
/** /**
* @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent) * @see javax.faces.render.Renderer#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
*/ */
@@ -59,7 +62,18 @@ public class ErrorsRenderer extends BaseRenderer
String contextPath = context.getExternalContext().getRequestContextPath(); String contextPath = context.getExternalContext().getRequestContextPath();
String styleClass = (String)component.getAttributes().get("styleClass"); String styleClass = (String)component.getAttributes().get("styleClass");
String errorClass = (String)component.getAttributes().get("errorClass"); String errorClass = (String)component.getAttributes().get("errorClass");
if (errorClass == null)
{
errorClass = DEFAULT_CSS_ERROR;
}
String infoClass = (String)component.getAttributes().get("infoClass"); String infoClass = (String)component.getAttributes().get("infoClass");
if (infoClass == null)
{
infoClass = DEFAULT_CSS_INFO;
}
String message = (String)component.getAttributes().get("message"); String message = (String)component.getAttributes().get("message");
String errorHint = Application.getMessage(context, ERROR_HINT); String errorHint = Application.getMessage(context, ERROR_HINT);
@@ -89,7 +103,7 @@ public class ErrorsRenderer extends BaseRenderer
out.write(">"); out.write(">");
// if we have a message to display show it next to the info icon // if we have a message to display show it next to the info icon
if (message.length() > 0) if (message.length() > 0 && context.getMaximumSeverity().compareTo(FacesMessage.SEVERITY_WARN) > 0)
{ {
out.write("<img src='"); out.write("<img src='");
out.write(contextPath); out.write(contextPath);
@@ -105,7 +119,7 @@ public class ErrorsRenderer extends BaseRenderer
out.write("<li"); out.write("<li");
renderMessageAttrs(fm, out, errorClass, infoClass); renderMessageAttrs(fm, out, errorClass, infoClass);
out.write(">"); out.write(">");
out.write(Utils.encode(fm.getSummary())); out.write(Utils.encode(fm.getDetail()));
out.write("</li>\n"); out.write("</li>\n");
} }
@@ -128,7 +142,7 @@ public class ErrorsRenderer extends BaseRenderer
out.write("<div style='margin-bottom: 3px;'"); out.write("<div style='margin-bottom: 3px;'");
renderMessageAttrs(fm, out, errorClass, infoClass); renderMessageAttrs(fm, out, errorClass, infoClass);
out.write(">"); out.write(">");
out.write(Utils.encode(fm.getSummary())); out.write(Utils.encode(fm.getDetail()));
out.write("</div>\n"); out.write("</div>\n");
} }