Repository: incubator-juneau Updated Branches: refs/heads/master 7231baab1 -> addeb00ed
Bug fixes. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/addeb00e Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/addeb00e Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/addeb00e Branch: refs/heads/master Commit: addeb00edf4b12d69324512601c17773271abea5 Parents: 7231baa Author: JamesBognar <[email protected]> Authored: Wed Jun 21 17:28:15 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Wed Jun 21 17:28:15 2017 -0400 ---------------------------------------------------------------------- .../apache/juneau/html/HtmlDocSerializerSession.java | 2 +- .../java/org/apache/juneau/html/HtmlSerializer.java | 13 +++++++++---- .../org/apache/juneau/rest/widget/QueryWidget.html | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/addeb00e/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java index 9f09744..5d136cb 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java @@ -85,7 +85,7 @@ public final class HtmlDocSerializerSession extends HtmlSerializerSession { links = ObjectUtils.isEmpty(m) ? null : new LinkedHashMap(m); cssUrl = op.getString(HTMLDOC_cssUrl, ctx.cssUrl); css = split(op.getString(HTMLDOC_css, null)); - nowrap = op.getBoolean(HTMLDOC_cssUrl, ctx.nowrap); + nowrap = op.getBoolean(HTMLDOC_nowrap, ctx.nowrap); noResultsMessage = op.getString(HTMLDOC_noResultsMessage, ctx.noResultsMessage); template = ClassUtils.newInstance(HtmlDocTemplate.class, op.get(HTMLDOC_template, ctx.template)); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/addeb00e/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java index bbd5050..b5ab39c 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java @@ -273,10 +273,15 @@ public class HtmlSerializer extends XmlSerializer { } HtmlClassMeta html = sType.getExtendedMeta(HtmlClassMeta.class); - HtmlRender render = html.getRender(); - - if (o != null && render != null) - return serializeAnything(session, out, render.getContent(session, o), null, typeName, 2, pMeta, false); + HtmlRender render = (pMeta == null ? null : pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).getRender()); + if (render == null) + render = html.getRender(); + + if (render != null) { + Object o2 = render.getContent(session, o); + if (o2 != o) + return serializeAnything(session, out, o2, null, typeName, 2, null, false); + } if (html.isAsXml() || (pMeta != null && pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isAsXml())) { super.serializeAnything(session, out, o, null, null, null, false, XmlFormat.MIXED, false, false, null); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/addeb00e/juneau-rest/src/main/resources/org/apache/juneau/rest/widget/QueryWidget.html ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/resources/org/apache/juneau/rest/widget/QueryWidget.html b/juneau-rest/src/main/resources/org/apache/juneau/rest/widget/QueryWidget.html index d89516f..63cb9de 100644 --- a/juneau-rest/src/main/resources/org/apache/juneau/rest/widget/QueryWidget.html +++ b/juneau-rest/src/main/resources/org/apache/juneau/rest/widget/QueryWidget.html @@ -107,8 +107,8 @@ <br><b>Date/Calendar fields:</b> <br><code>[column=2001]</code> - A specific year <br><code>[column=2001.01.01.10.50]</code> - A specific time - <br><code>[column=>2001]</code> - After a specific year - <br><code>[column=>=2001]</code> - During or after a specific year + <br><code>[column>2001]</code> - After a specific year + <br><code>[column>=2001]</code> - During or after a specific year <br><code>[column=2001-2003.06.30]</code> - A date range <br><code>[column=2001 2003 2005]</code> - Multiple ORed dates </span>
