Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2851] [RHQ-148] - add the ability to filter the recently approved resources portlet by time AND absolute item count;
|
From: <jma...@rh...> - 2009-01-30 17:42:32
|
<!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] [2851] [RHQ-148] - add the ability to filter the recently approved resources portlet by time AND absolute item count; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2851</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-01-30 11:42:06 -0600 (Fri, 30 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-148] - add the ability to filter the recently approved resources portlet by time AND absolute item count; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyWebUserPreferencesjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUserPreferences.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletproblemresourcesModifyActionjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/problemresources/ModifyAction.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletrecentlyApprovedModifyActionjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ModifyAction.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletrecentlyApprovedPrepareActionjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/PrepareAction.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletrecentlyApprovedPropertiesFormjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/PropertiesForm.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletrecentlyApprovedViewActionjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ViewAction.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappportletrecentlyApprovedPropertiesjsp">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/portlet/recentlyApproved/Properties.jsp</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappfilteredWEBINFclassesApplicationResourcesproperties">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverresourceResourceManagerBeanjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverresourceResourceManagerLocaljava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyWebUserPreferencesjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUserPreferences.java (2850 => 2851)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUserPreferences.java 2009-01-30 17:08:14 UTC (rev 2850) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUserPreferences.java 2009-01-30 17:42:06 UTC (rev 2851) </span><span class="lines">@@ -45,6 +45,7 @@ </span><span class="cx"> public static final String PREF_DASH_PROBLEM_RESOURCES_IGNORED = ".dashContent.problemResources.ignoreList"; public static final String PREF_DASH_RECENTLY_APPROVED_RANGE = ".dashContent.recentlyApproved.range"; </span><span class="add">+ public static final String PREF_DASH_RECENTLY_APPROVED_HOURS = ".dashContent.recentlyApproved.hours"; </span><span class="cx"> public static final String PREF_DASH_RECENTLY_APPROVED_EXPANDED_PLATFORMS = ".dashContent.recentlyApproved.expandedPlatforms"; public static final String PREF_DASH_FAVORITE_RESOURCES_AVAILABILITY = ".dashContent.resourcehealth.availability"; </span><span class="lines">@@ -202,8 +203,8 @@ </span><span class="cx"> public ProblemResourcesPortletPreferences getProblemResourcesPortletPreferences() { ProblemResourcesPortletPreferences prefs = new ProblemResourcesPortletPreferences(); </span><span class="rem">- prefs.range = getIntPref(PREF_DASH_PROBLEM_RESOURCES_ROWS); - prefs.hours = getIntPref(PREF_DASH_PROBLEM_RESOURCES_HOURS); </span><span class="add">+ prefs.range = getIntPref(PREF_DASH_PROBLEM_RESOURCES_ROWS, 10); + prefs.hours = getIntPref(PREF_DASH_PROBLEM_RESOURCES_HOURS, -1); </span><span class="cx"> prefs.showIgnored = getBooleanPref(PREF_DASH_PROBLEM_RESOURCES_SHOW_IGNORED); prefs.ignoreList = getPreference(PREF_DASH_PROBLEM_RESOURCES_IGNORED); return prefs; </span><span class="lines">@@ -218,18 +219,21 @@ </span><span class="cx"> public static class RecentlyApprovedPortletPreferences { public int range; </span><span class="add">+ public int hours; </span><span class="cx"> public List<String> expandedPlatforms; } public RecentlyApprovedPortletPreferences getRecentlyApprovedPortletPreferences() { RecentlyApprovedPortletPreferences prefs = new RecentlyApprovedPortletPreferences(); </span><span class="rem">- prefs.range = getIntPref(PREF_DASH_RECENTLY_APPROVED_RANGE); </span><span class="add">+ prefs.range = getIntPref(PREF_DASH_RECENTLY_APPROVED_RANGE, 10); + prefs.hours = getIntPref(PREF_DASH_RECENTLY_APPROVED_HOURS, -1); </span><span class="cx"> prefs.expandedPlatforms = getPreferenceAsList(PREF_DASH_RECENTLY_APPROVED_EXPANDED_PLATFORMS); return prefs; } public void setRecentlyApprovedPortletPreferences(RecentlyApprovedPortletPreferences prefs) { setPreference(PREF_DASH_RECENTLY_APPROVED_RANGE, prefs.range); </span><span class="add">+ setPreference(PREF_DASH_RECENTLY_APPROVED_HOURS, prefs.hours); </span><span class="cx"> setPreference(PREF_DASH_RECENTLY_APPROVED_EXPANDED_PLATFORMS, prefs.expandedPlatforms); } </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletproblemresourcesModifyActionjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/problemresources/ModifyAction.java (2850 => 2851)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/problemresources/ModifyAction.java 2009-01-30 17:08:14 UTC (rev 2850) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/problemresources/ModifyAction.java 2009-01-30 17:42:06 UTC (rev 2851) </span><span class="lines">@@ -20,12 +20,14 @@ </span><span class="cx"> import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; </span><span class="add">+import javax.servlet.http.HttpSession; </span><span class="cx"> import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.rhq.enterprise.gui.legacy.Constants; </span><span class="add">+import org.rhq.enterprise.gui.legacy.RetCodeConstants; </span><span class="cx"> import org.rhq.enterprise.gui.legacy.WebUser; import org.rhq.enterprise.gui.legacy.WebUserPreferences; import org.rhq.enterprise.gui.legacy.WebUserPreferences.ProblemResourcesPortletPreferences; </span><span class="lines">@@ -37,12 +39,12 @@ </span><span class="cx"> @Override public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { </span><span class="add">+ </span><span class="cx"> PropertiesForm pForm = (PropertiesForm) form; </span><span class="rem">- WebUser user = SessionUtils.getWebUser(request.getSession()); </span><span class="add">+ HttpSession session = request.getSession(); + WebUser user = SessionUtils.getWebUser(session); </span><span class="cx"> WebUserPreferences preferences = user.getWebPreferences(); </span><span class="rem">- String forwardStr = Constants.SUCCESS_URL; - </span><span class="cx"> ActionForward forward = checkSubmit(request, mapping, form); if (forward != null) { </span><span class="lines">@@ -58,7 +60,8 @@ </span><span class="cx"> preferences.persistPreferences(); </span><span class="rem">- request.getSession().removeAttribute(Constants.USERS_SES_PORTAL); - return mapping.findForward(forwardStr); </span><span class="add">+ session.removeAttribute(Constants.USERS_SES_PORTAL); + + return mapping.findForward(RetCodeConstants.SUCCESS_URL); </span><span class="cx"> } } \ No newline at end of file </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletrecentlyApprovedModifyActionjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ModifyAction.java (2850 => 2851)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ModifyAction.java 2009-01-30 17:08:14 UTC (rev 2850) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ModifyAction.java 2009-01-30 17:42:06 UTC (rev 2851) </span><span class="lines">@@ -44,8 +44,6 @@ </span><span class="cx"> HttpSession session = request.getSession(); WebUser user = SessionUtils.getWebUser(session); WebUserPreferences preferences = user.getWebPreferences(); </span><span class="rem">- RecentlyApprovedPortletPreferences recentlyApprovedPreferences = preferences - .getRecentlyApprovedPortletPreferences(); </span><span class="cx"> ActionForward forward = checkSubmit(request, mapping, form); </span><span class="lines">@@ -57,8 +55,9 @@ </span><span class="cx"> DashboardUtils.removePortlet(user, pForm.getPortletName()); } </span><span class="rem">- recentlyApprovedPreferences.range = pForm.getRange(); - preferences.setRecentlyApprovedPortletPreferences(recentlyApprovedPreferences); </span><span class="add">+ RecentlyApprovedPortletPreferences problemResourcePreferences = pForm.getRecentlyApprovedPortletPreferences(); + preferences.setRecentlyApprovedPortletPreferences(problemResourcePreferences); + </span><span class="cx"> preferences.persistPreferences(); session.removeAttribute(Constants.USERS_SES_PORTAL); </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletrecentlyApprovedPrepareActionjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/PrepareAction.java (2850 => 2851)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/PrepareAction.java 2009-01-30 17:08:14 UTC (rev 2850) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/PrepareAction.java 2009-01-30 17:42:06 UTC (rev 2851) </span><span class="lines">@@ -32,15 +32,17 @@ </span><span class="cx"> import org.rhq.enterprise.gui.legacy.action.BaseAction; public class PrepareAction extends BaseAction { </span><span class="add">+ @Override </span><span class="cx"> public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { HttpSession session = request.getSession(); WebUser user = (WebUser) session.getAttribute(Constants.WEBUSER_SES_ATTR); </span><span class="rem">- RecentlyApprovedPortletPreferences preferences = user.getWebPreferences().getRecentlyApprovedPortletPreferences(); </span><span class="add">+ RecentlyApprovedPortletPreferences preferences = user.getWebPreferences() + .getRecentlyApprovedPortletPreferences(); </span><span class="cx"> PropertiesForm pForm = (PropertiesForm) form; </span><span class="rem">- pForm.setRange(preferences.range); </span><span class="add">+ pForm.setRecentlyApprovedPortletPreferences(preferences); </span><span class="cx"> return null; } </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletrecentlyApprovedPropertiesFormjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/PropertiesForm.java (2850 => 2851)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/PropertiesForm.java 2009-01-30 17:08:14 UTC (rev 2850) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/PropertiesForm.java 2009-01-30 17:42:06 UTC (rev 2851) </span><span class="lines">@@ -19,20 +19,34 @@ </span><span class="cx"> package org.rhq.enterprise.gui.legacy.portlet.recentlyApproved; // XXX: remove when ImageBeanButton works </span><span class="add">+import org.rhq.enterprise.gui.legacy.WebUserPreferences.RecentlyApprovedPortletPreferences; </span><span class="cx"> import org.rhq.enterprise.gui.legacy.portlet.DashboardBaseForm; public class PropertiesForm extends DashboardBaseForm { </span><span class="rem">- private Integer range; </span><span class="cx"> </span><span class="rem">- public PropertiesForm() { - super(); </span><span class="add">+ RecentlyApprovedPortletPreferences prefs = new RecentlyApprovedPortletPreferences(); + + public int getHours() { + return this.prefs.hours; </span><span class="cx"> } </span><span class="rem">- public Integer getRange() { - return this.range; </span><span class="add">+ public void setHours(int hours) { + this.prefs.hours = hours; </span><span class="cx"> } </span><span class="rem">- public void setRange(Integer range) { - this.range = range; </span><span class="add">+ public int getRows() { + return this.prefs.range; </span><span class="cx"> } </span><span class="add">+ + public void setRows(int rows) { + this.prefs.range = rows; + } + + public RecentlyApprovedPortletPreferences getRecentlyApprovedPortletPreferences() { + return prefs; + } + + public void setRecentlyApprovedPortletPreferences(RecentlyApprovedPortletPreferences prefs) { + this.prefs = prefs; + } </span><span class="cx"> } \ No newline at end of file </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyportletrecentlyApprovedViewActionjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ViewAction.java (2850 => 2851)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ViewAction.java 2009-01-30 17:08:14 UTC (rev 2850) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ViewAction.java 2009-01-30 17:42:06 UTC (rev 2851) </span><span class="lines">@@ -67,10 +67,10 @@ </span><span class="cx"> Subject subject = user.getSubject(); // Based on the user preference, generate a timestamp of the oldest resource to display. </span><span class="rem">- long range = recentlyApprovedPreferences.range; </span><span class="add">+ long range = recentlyApprovedPreferences.hours; </span><span class="cx"> long ts = System.currentTimeMillis() - (range * 60 * 60 * 1000); // range encoded as hours (UI shows days) </span><span class="rem">- platformList = resourceManager.getRecentlyAddedPlatforms(subject, ts); </span><span class="add">+ platformList = resourceManager.getRecentlyAddedPlatforms(subject, ts, recentlyApprovedPreferences.range); </span><span class="cx"> Map<Integer, RecentlyAddedResourceComposite> platformMap; platformMap = new HashMap<Integer, RecentlyAddedResourceComposite>(); </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappportletrecentlyApprovedPropertiesjsp"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/portlet/recentlyApproved/Properties.jsp (2850 => 2851)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/portlet/recentlyApproved/Properties.jsp 2009-01-30 17:08:14 UTC (rev 2850) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/portlet/recentlyApproved/Properties.jsp 2009-01-30 17:42:06 UTC (rev 2851) </span><span class="lines">@@ -28,26 +28,44 @@ </span><span class="cx"> </tiles:insert> <table width="100%" cellpadding="0" cellspacing="0" border="0"> </span><span class="rem">- <tr> </span><span class="add">+ <tr> + <td colspan="4" class="BlockContent"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td> + </tr> + <tr valign="top"> </span><span class="cx"> <td width="20%" class="BlockLabel" valign="center"><fmt:message key="dash.settings.FormLabel.RecentlyApprovedShow"/></td> </span><span class="rem">- <td width="80%" class="BlockContent" colspan="3" valign="center"> - <table width="100%" cellpadding="0" cellspacing="5" border="0"> - <tr> - <td nowrap><fmt:message key="dash.settings.recentlyApproved.last"/></td> - <td> - <html:select property="range"> - <html:option value="24">1</html:option> - <html:option value="120">5</html:option> - <html:option value="240">10</html:option> - <html:option value="360">15</html:option> </span><span class="add">+ <td width="1%" class="BlockContent"> + <html:select property="rows"> + <html:option value="5">5</html:option> + <html:option value="10">10</html:option> + <html:option value="15">15</html:option> + <html:option value="20">20</html:option> + <html:option value="30">30</html:option> </span><span class="cx"> </html:select> </span><span class="rem">- </td> - <td width="100%"><fmt:message key="dash.settings.recentlyApproved.approved"/></td> - </tr> - </table> </span><span class="cx"> </td> </span><span class="add">+ <td class="BlockContent" valign="center"> + <fmt:message key="dash.settings.FormLabel.RecentlyApprovedMax"/> + </td> </span><span class="cx"> </tr> <tr> </span><span class="add">+ <td colspan="3" class="BlockContent"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td> + </tr> + <tr> + <td width="20%" class="BlockLabel" valign="center"><fmt:message key="dash.settings.FormLabel.RecentlyApprovedLast"/></td> + <td width="1%" class="BlockContent"> + <html:select property="hours"> + <html:option value="1">1</html:option> + <html:option value="4">4</html:option> + <html:option value="8">8</html:option> + <html:option value="24">24</html:option> + <html:option value="48">48</html:option> + <html:option value="-1"><fmt:message key="dash.settings.FormLabel.RecentlyApprovedUnlimited"/></html:option> + </html:select> + </td> + <td class="BlockContent" valign="center"> + <fmt:message key="dash.settings.FormLabel.RecentlyApprovedHours"/> + </td> + </tr> + <tr> </span><span class="cx"> <td colspan="4" class="BlockContent"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td> </tr> <tr> </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappfilteredWEBINFclassesApplicationResourcesproperties"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties (2850 => 2851)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties 2009-01-30 17:08:14 UTC (rev 2850) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties 2009-01-30 17:42:06 UTC (rev 2851) </span><span class="lines">@@ -869,6 +869,10 @@ </span><span class="cx"> dash.settings.FormLabel.AlertRange=Alert Range: dash.settings.FormLabel.SummaryCounts=Show Summary Counts of: dash.settings.FormLabel.RecentlyApprovedShow=Show Maximum of: </span><span class="add">+dash.settings.FormLabel.RecentlyApprovedLast=For the Last: +dash.settings.FormLabel.RecentlyApprovedMax=recently approved resources on the dashboard +dash.settings.FormLabel.RecentlyApprovedUnlimited=unlimited +dash.settings.FormLabel.RecentlyApprovedHours=hours </span><span class="cx"> dash.settings.FormLabel.ProblemResourcesShow=Show Maximum of: dash.settings.FormLabel.ProblemResourcesLast=For the Last: dash.settings.FormLabel.ProblemResourcesMax=problem resources on the dashboard </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverresourceResourceManagerBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java (2850 => 2851)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java 2009-01-30 17:08:14 UTC (rev 2850) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java 2009-01-30 17:42:06 UTC (rev 2851) </span><span class="lines">@@ -1101,7 +1101,7 @@ </span><span class="cx"> } @SuppressWarnings("unchecked") </span><span class="rem">- public List<RecentlyAddedResourceComposite> getRecentlyAddedPlatforms(Subject user, long ctime) { </span><span class="add">+ public List<RecentlyAddedResourceComposite> getRecentlyAddedPlatforms(Subject user, long ctime, int maxItems) { </span><span class="cx"> Query query; if (authorizationManager.isInventoryManager(user)) { </span><span class="lines">@@ -1112,7 +1112,7 @@ </span><span class="cx"> } query.setParameter("oldestEpochTime", ctime); </span><span class="rem">- query.setMaxResults(100); // this query is only used by the dashboard portlet, let's not blow it up </span><span class="add">+ query.setMaxResults(maxItems); // this query is only used by the dashboard portlet, let's not blow it up </span><span class="cx"> return query.getResultList(); } </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverresourceResourceManagerLocaljava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java (2850 => 2851)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java 2009-01-30 17:08:14 UTC (rev 2850) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java 2009-01-30 17:42:06 UTC (rev 2851) </span><span class="lines">@@ -35,11 +35,11 @@ </span><span class="cx"> import org.rhq.core.domain.resource.ResourceErrorType; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.composite.RecentlyAddedResourceComposite; </span><span class="add">+import org.rhq.core.domain.resource.composite.ResourceAvailabilitySummary; </span><span class="cx"> import org.rhq.core.domain.resource.composite.ResourceComposite; import org.rhq.core.domain.resource.composite.ResourceHealthComposite; import org.rhq.core.domain.resource.composite.ResourceIdFlyWeight; import org.rhq.core.domain.resource.composite.ResourceWithAvailability; </span><span class="rem">-import org.rhq.core.domain.resource.composite.ResourceAvailabilitySummary; </span><span class="cx"> import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.AutoGroupComposite; import org.rhq.core.domain.util.PageControl; </span><span class="lines">@@ -183,8 +183,8 @@ </span><span class="cx"> * @return the resource, or null if no such resource exists */ @Nullable </span><span class="rem">- Resource getResourceByParentAndKey(Subject user, @Nullable - Resource parent, String key, String plugin, String typeName); </span><span class="add">+ Resource getResourceByParentAndKey(Subject user, @Nullable Resource parent, String key, String plugin, + String typeName); </span><span class="cx"> PageList<Resource> getResourceByParentAndInventoryStatus(Subject user, Resource parent, InventoryStatus status, PageControl pageControl); </span><span class="lines">@@ -221,10 +221,11 @@ </span><span class="cx"> * * @param user * @param ctime the oldest time (epoch mills) that a platform had to have been added for it to be returned </span><span class="add">+ * @param maxItems the maximum number of items to return within the timeframe </span><span class="cx"> * * @return list of all platforms that were added since or at <code>ctime</code> */ </span><span class="rem">- List<RecentlyAddedResourceComposite> getRecentlyAddedPlatforms(Subject user, long ctime); </span><span class="add">+ List<RecentlyAddedResourceComposite> getRecentlyAddedPlatforms(Subject user, long ctime, int maxItems); </span><span class="cx"> /** * Gets a list of servers that are children of the given platform that were recently added (committed) to inventory. </span><span class="lines">@@ -372,7 +373,6 @@ </span><span class="cx"> */ Resource getPlatform(Agent agent); </span><span class="rem">- </span><span class="cx"> /** * Load the entire list of resources under an agent. Tries to do so in as few * queries as possible while prefectching the information necessary to create a tree </span><span class="lines">@@ -390,6 +390,5 @@ </span><span class="cx"> */ List<Resource> getResourcesByAgent(Subject user, int agentId, PageControl pageControl); </span><span class="rem">- </span><span class="cx"> ResourceAvailabilitySummary getAvailabilitySummary(Subject user, int resourceId); } \ No newline at end of file </span> </pre> </div> </div> </body> </html> |
