Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [3659] [RHQ-1874] - render structural crumbs for resources so they point to the summary tab not inventory tab;
|
From: <jma...@rh...> - 2009-04-09 05:19:47
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [3659] [RHQ-1874] - render structural crumbs for resources so they point to the summary tab not inventory tab; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>3659</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-04-09 00:19:45 -0500 (Thu, 09 Apr 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1874] - render structural crumbs for resources so they point to the summary tab not inventory tab; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiinventoryresourceResourceLineageRendererjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceLineageRenderer.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacytaglibInventoryHierarchyTagjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/InventoryHierarchyTag.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiinventoryresourceResourceLineageRendererjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceLineageRenderer.java (3658 => 3659)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceLineageRenderer.java 2009-04-09 05:10:15 UTC (rev 3658) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceLineageRenderer.java 2009-04-09 05:19:45 UTC (rev 3659) </span><span class="lines">@@ -36,7 +36,7 @@ </span><span class="cx"> * @author Ian Springer */ public class ResourceLineageRenderer extends Renderer { </span><span class="rem">- private static final String BASE_RESOURCE_URL = "/rhq/resource/inventory/view.xhtml"; </span><span class="add">+ private static final String BASE_RESOURCE_URL = "/rhq/resource/summary/overview.xhtml"; </span><span class="cx"> private static final String SEPARATOR = " > "; private ResourceManagerLocal resourceManager = LookupUtil.getResourceManager(); </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacytaglibInventoryHierarchyTagjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/InventoryHierarchyTag.java (3658 => 3659)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/InventoryHierarchyTag.java 2009-04-09 05:10:15 UTC (rev 3658) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/InventoryHierarchyTag.java 2009-04-09 05:19:45 UTC (rev 3659) </span><span class="lines">@@ -46,7 +46,7 @@ </span><span class="cx"> * @author Ian Springer */ public class InventoryHierarchyTag extends TagSupport { </span><span class="rem">- private static final String BASE_RESOURCE_URL = "/rhq/resource/inventory/view.xhtml"; </span><span class="add">+ private static final String BASE_RESOURCE_URL = "/rhq/resource/summary/overview.xhtml"; </span><span class="cx"> //private static final String BASE_GROUP_URL = "/Resource.do?type=GROUP"; private static final String BASE_GROUP_URL = "/rhq/group/inventory/view.xhtml"; </span><span class="lines">@@ -119,7 +119,8 @@ </span><span class="cx"> private String buildResourceHTML(Integer resourceId) { List<Resource> ancestorResources = this.resourceManager.getResourceLineage(resourceId); if (ancestorResources.isEmpty()) { </span><span class="rem">- throw new IllegalStateException("The list of ancestor resources should always contain at least one resource - the resource whose lineage was requested."); </span><span class="add">+ throw new IllegalStateException( + "The list of ancestor resources should always contain at least one resource - the resource whose lineage was requested."); </span><span class="cx"> } Resource parentResource = ancestorResources.get(ancestorResources.size() - 1); </span><span class="lines">@@ -191,7 +192,8 @@ </span><span class="cx"> } private String buildAutoGroupURL() { </span><span class="rem">- String url = BASE_AUTOGROUP_URL + "?id=" + parentResourceId + "&parent=" + parentResourceId + "&type=" + resourceTypeId; </span><span class="add">+ String url = BASE_AUTOGROUP_URL + "?id=" + parentResourceId + "&parent=" + parentResourceId + "&type=" + + resourceTypeId; </span><span class="cx"> // Session-encode the URL in case the client doesn't have cookies enabled. return encodeURL(url); </span> </pre> </div> </div> </body> </html> |