java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java | 8
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 123
++---
java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java | 2
java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java | 11
java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 2
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 224
+++++-----
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 2
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 2
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp | 218
+++++----
java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 2
22 files changed, 341 insertions(+), 279 deletions(-)
New commits:
commit 780e8189bc2d661671cc7764f17f462f47c2702a
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Fri Dec 13 16:44:36 2013 +0100
trailing whitespace
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
index ef33e12..f69c637 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
@@ -566,7 +566,7 @@ public class ListTag extends BodyTagSupport {
manip.bindPaginationInfo();
request.setAttribute("dataSize", String
.valueOf(pageData.size() + 1));
-
+
if (pageData != null && pageData.size() > 0) {
iterator = pageData.iterator();
}
commit 1935003ecf78507494eb789cede752b8742976af
Author: Johannes Renner <jrenner(a)suse.de>
Date: Fri Dec 13 10:17:04 2013 +0100
Add missing colon after activation key description label
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
index 61d7244..8715cf6 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
@@ -13,7 +13,7 @@
<div class="form-group">
<label class="col-lg-3 control-label"
for="description">
- <bean:message
key="kickstart.activationkeys.jsp.description"/>
+ <bean:message
key="kickstart.activationkeys.jsp.description"/>:
</label>
<div class="col-lg-6">
<html:text property="description"
styleClass="form-control" styleId="description"/><br/>
commit 009124ac31b5ff9869ae1e66eb2dc964a2f0137f
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Thu Dec 12 18:48:23 2013 +0100
System management options have been modified to look more similar to how it looked in
the later version of Spacewalk
diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
index c9c34f3..e677cb9 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
@@ -15,99 +15,139 @@
<ul><bean:message key="ssm.overview.summary2"/></ul>
</div>
+
<div class="panel panel-default">
- <div class="panel-heading">
- <i class="fa fa-desktop fa-fw" title="<bean:message
key="ssm.overview.systems" />"></i>
- <bean:message key="ssm.overview.systems"/>
- </div>
- <div class="panel-body">
- <bean:message key="ssm.overview.systems.list"/>
- </div>
- <div class="panel-heading">
- <i class="fa spacewalk-icon-patches fa-fw"
title="<bean:message key="ssm.overview.errata"/>"></i>
- <bean:message key="ssm.overview.errata"/>
- </div>
- <div class="panel-body">
- <bean:message key="ssm.overview.errata.schedule"/>
- </div>
- <div class="panel-heading">
- <i class="fa spacewalk-icon-packages fa-fw"
title="<bean:message key='ssm.overview.packages'/>"></i>
- <bean:message key="ssm.overview.packages"/>
- </div>
- <div class="panel-body">
- <bean:message key="ssm.overview.packages.upgrade"/>
- </div>
- <rhn:require acl="is(enable_solaris_support)">
- <div class="panel-heading">
- <i class="fa spacewalk-icon-patches fa-fw"
title="<bean:message key='ssm.overview.patches'/>"></i>
- <bean:message key="ssm.overview.patches"/>
- </div>
- <div class="panel-body">
- <a
href="/network/systems/ssm/patches/install.pxt"><bean:message
key="ssm.overview.patches.install"/></a> / <a
href="/network/systems/ssm/patches/remove.pxt"><bean:message
key="ssm.overview.patches.remove"/></a>
- <bean:message key="ssm.overview.patches.patches"/>
- </div>
- <div class="panel-heading">
- <i class="fa spacewalk-icon-patch-set fa-fw"
title="<bean:message
key='ssm.overview.patch.clusters'/>"></i>
- <bean:message key="ssm.overview.patch.clusters"/>
- </div>
- <div class="panel-body">
- <bean:message key="ssm.overview.patch.clusters.install"/>
- </div>
- </rhn:require>
- <rhn:require acl="user_role(org_admin)">
- <div class="panel-heading">
- <i class="fa spacewalk-icon-system-groups fa-fw"
title="<bean:message key='ssm.overview.groups'/>"></i>
- <bean:message key="ssm.overview.groups"/>
- </div>
- <div class="panel-body">
- <bean:message key="ssm.overview.groups.create"/>
- </div>
- </rhn:require>
- <div class="panel-heading">
- <i class="fa spacewalk-icon-software-channels fa-fw"
title="<bean:message key='ssm.overview.channels'/>"></i>
- <bean:message key="ssm.overview.channels"/>
- </div>
- <div class="panel-body">
- <ul>
- <li><bean:message
key="ssm.overview.channels.memberships"/></li>
- <rhn:require acl="org_entitlement(rhn_provisioning);
user_role(config_admin)">
- <li><bean:message
key="ssm.overview.channels.subscriptions"/></li>
- <li><bean:message
key="ssm.overview.channels.deploy"/></li>
- </rhn:require>
- </ul>
- </div>
- <rhn:require acl="org_entitlement(rhn_provisioning);">
- <div class="panel-heading">
- <i class="fa fa-rocket fa-fw" title="<bean:message
key='ssm.overview.provisioning'/>"></i>
- <bean:message key="ssm.overview.provisioning"/>
- </div>
- <div class="panel-body">
- <ul>
- <li><bean:message
key="ssm.overview.provisioning.kickstart"/></li>
- <li><bean:message
key="ssm.overview.provisioning.rollback"/></li>
- <li><bean:message
key="ssm.overview.provisioning.remotecommands"/></li>
- </ul>
- </div>
- </rhn:require>
- <div class="panel-heading">
- <i class="fa fa-suitcase fa-fw" title="<bean:message
key='ssm.overview.misc'/>"></i>
- <bean:message key="ssm.overview.misc"/>
- </div>
- <div class="panel-body">
- <ul>
- <li><bean:message
key="ssm.overview.misc.updateprofiles"/></li>
- <rhn:require acl="org_entitlement(rhn_provisioning)">
- <li><bean:message
key="ssm.overview.misc.customvalues"/></li>
- </rhn:require>
- <rhn:require
acl="user_role(org_admin);org_entitlement(rhn_provisioning) or
org_entitlement(rhn_monitor)">
- <li><bean:message
key="ssm.overview.misc.entitlements"/></li>
- </rhn:require>
- <li><bean:message
key="ssm.overview.misc.delete"/></li>
- <li><bean:message
key="ssm.overview.misc.reboot"/></li>
- <li><bean:message
key="ssm.overview.misc.migrate"/></li>
- <li><bean:message
key="ssm.overview.misc.scap"/></li>
- </ul>
- </div>
+ <ul class="list-group">
+ <li class="list-group-item">
+ <div class="row">
+ <div class="col-sm-2">
+ <i class="fa fa-desktop fa-fw"
title="<bean:message key="ssm.overview.systems"
/>"></i>
+ <bean:message key="ssm.overview.systems"/>
+ </div>
+ <div class="col-sm-10">
+ <bean:message key="ssm.overview.systems.list"/>
+ </div>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="row">
+ <div class="col-sm-2">
+ <i class="fa spacewalk-icon-patches fa-fw"
title="<bean:message key="ssm.overview.errata"/>"></i>
+ <bean:message key="ssm.overview.errata"/>
+ </div>
+ <div class="col-sm-10">
+ <bean:message key="ssm.overview.errata.schedule"/>
+ </div>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="row">
+ <div class="col-sm-2">
+ <i class="fa spacewalk-icon-packages fa-fw"
title="<bean:message key='ssm.overview.packages'/>"></i>
+ <bean:message key="ssm.overview.packages"/>
+ </div>
+ <div class="col-sm-10">
+ <bean:message key="ssm.overview.packages.upgrade"/>
+ </div>
+ </div>
+ </li>
+ <rhn:require acl="is(enable_solaris_support)">
+ <li class="list-group-item">
+ <div class="row">
+ <div class="col-sm-2">
+ <i class="fa spacewalk-icon-patches fa-fw"
title="<bean:message key='ssm.overview.patches'/>"></i>
+ <bean:message key="ssm.overview.patches"/>
+ </div>
+ <div class="col-sm-10">
+ <a
href="/network/systems/ssm/patches/install.pxt"><bean:message
key="ssm.overview.patches.install"/></a> / <a
href="/network/systems/ssm/patches/remove.pxt"><bean:message
key="ssm.overview.patches.remove"/></a>
+ <bean:message
key="ssm.overview.patches.patches"/>
+ </div>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="row">
+ <div class="col-sm-2">
+ <i class="fa spacewalk-icon-patch-set fa-fw"
title="<bean:message
key='ssm.overview.patch.clusters'/>"></i>
+ <bean:message
key="ssm.overview.patch.clusters"/>
+ </div>
+ <div class="col-sm-10">
+ <bean:message
key="ssm.overview.patch.clusters.install"/>
+ </div>
+ </div>
+ </li>
+ </rhn:require>
+ <rhn:require acl="user_role(org_admin)">
+ <li class="list-group-item">
+ <div class="row">
+ <div class="col-sm-2">
+ <i class="fa spacewalk-icon-system-groups fa-fw"
title="<bean:message key='ssm.overview.groups'/>"></i>
+ <bean:message key="ssm.overview.groups"/>
+ </div>
+ <div class="col-sm-10">
+ <bean:message key="ssm.overview.groups.create"/>
+ </div>
+ </div>
+ </li>
+ </rhn:require>
+ <li class="list-group-item">
+ <div class="row">
+ <div class="col-sm-2">
+ <i class="fa spacewalk-icon-software-channels fa-fw"
title="<bean:message key='ssm.overview.channels'/>"></i>
+ <bean:message key="ssm.overview.channels"/>
+ </div>
+ <div class="col-sm-10">
+ <ul>
+ <li><bean:message
key="ssm.overview.channels.memberships"/></li>
+ <rhn:require acl="org_entitlement(rhn_provisioning);
user_role(config_admin)">
+ <li><bean:message
key="ssm.overview.channels.subscriptions"/></li>
+ <li><bean:message
key="ssm.overview.channels.deploy"/></li>
+ </rhn:require>
+ </ul>
+ </div>
+ </div>
+ </li>
+ <rhn:require acl="org_entitlement(rhn_provisioning);">
+ <li class="list-group-item">
+ <div class="row">
+ <div class="col-sm-2">
+ <i class="fa fa-rocket fa-fw"
title="<bean:message
key='ssm.overview.provisioning'/>"></i>
+ <bean:message key="ssm.overview.provisioning"/>
+ </div>
+ <div class="col-sm-10">
+ <ul>
+ <li><bean:message
key="ssm.overview.provisioning.kickstart"/></li>
+ <li><bean:message
key="ssm.overview.provisioning.rollback"/></li>
+ <li><bean:message
key="ssm.overview.provisioning.remotecommands"/></li>
+ </ul>
+ </div>
+ </div>
+ </li>
+ </rhn:require>
+ <li class="list-group-item">
+ <div class="row">
+ <div class="col-sm-2">
+ <i class="fa fa-suitcase fa-fw"
title="<bean:message key='ssm.overview.misc'/>"></i>
+ <bean:message key="ssm.overview.misc"/>
+ </div>
+ <div class="col-sm-10">
+ <ul>
+ <li><bean:message
key="ssm.overview.misc.updateprofiles"/></li>
+ <rhn:require
acl="org_entitlement(rhn_provisioning)">
+ <li><bean:message
key="ssm.overview.misc.customvalues"/></li>
+ </rhn:require>
+ <rhn:require
acl="user_role(org_admin);org_entitlement(rhn_provisioning) or
org_entitlement(rhn_monitor)">
+ <li><bean:message
key="ssm.overview.misc.entitlements"/></li>
+ </rhn:require>
+ <li><bean:message
key="ssm.overview.misc.delete"/></li>
+ <li><bean:message
key="ssm.overview.misc.reboot"/></li>
+ <li><bean:message
key="ssm.overview.misc.migrate"/></li>
+ <li><bean:message
key="ssm.overview.misc.scap"/></li>
+ </ul>
+ </div>
+ </div>
+ </li>
+ </ul>
+
</div>
</body>
commit 5e0ce13ce88dea81c6a47d04000aae7c78b5e0c8
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Dec 12 17:05:45 2013 +0100
Fix messed up indentation and add missing <div class="checkbox">
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp
b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp
index 8509f03..36b73d3 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp
@@ -105,108 +105,110 @@
</div>
</div>
- <div class="form-group">
- <label class="col-lg-3 control-label"
for="autoerrataupdate">
- <bean:message
key="sdc.details.edit.autoerrataupdate"/>
- </label>
- <div class="col-lg-6">
- <c:choose>
- <c:when test="${system.baseEntitlement ==
null}">
- <bean:message
key="sdc.details.edit.autoupdate.unentitled"/>
- </c:when>
- <c:otherwise>
- <label for="autoerrataupdate">
- <html:checkbox property="auto_update"
styleId="autoerrataupdate"/>
- <bean:message
key="sdc.details.edit.autoupdate"/>
- </label>
- </c:otherwise>
- </c:choose>
- </div>
- </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="autoerrataupdate">
+ <bean:message
key="sdc.details.edit.autoerrataupdate"/>
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test="${system.baseEntitlement ==
null}">
+ <bean:message
key="sdc.details.edit.autoupdate.unentitled"/>
+ </c:when>
+ <c:otherwise>
+ <div class="checkbox">
+ <label for="autoerrataupdate">
+ <html:checkbox
property="auto_update" styleId="autoerrataupdate"/>
+ <bean:message
key="sdc.details.edit.autoupdate"/>
+ </label>
+ </div>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
- <div class="form-group">
- <label for="description" class="col-lg-3
control-label">
- <bean:message key="sdc.details.edit.description" />
- </label>
- <div class="col-lg-6">
- <html:textarea property="description"
styleClass="form-control" rows="6"
styleId="description"/>
- </div>
- </div>
+ <div class="form-group">
+ <label for="description" class="col-lg-3
control-label">
+ <bean:message key="sdc.details.edit.description"
/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="description"
styleClass="form-control" rows="6"
styleId="description"/>
+ </div>
+ </div>
- <div class="form-group">
- <label for="address" class="col-lg-3
control-label">
- <bean:message key="sdc.details.edit.address"/>
- </label>
- <div class="col-lg-6">
- <html:text property="address1" maxlength="128"
styleClass="form-control" styleId="address"/><br/>
- <html:text property="address2" maxlength="128"
styleClass="form-control" />
- </div>
- </div>
+ <div class="form-group">
+ <label for="address" class="col-lg-3
control-label">
+ <bean:message
key="sdc.details.edit.address"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="address1"
maxlength="128" styleClass="form-control"
styleId="address"/><br/>
+ <html:text property="address2"
maxlength="128" styleClass="form-control" />
+ </div>
+ </div>
- <div class="form-group">
- <label for="city" class="col-lg-3
control-label">
- <bean:message key="sdc.details.edit.city"/>
- </label>
- <div class="col-lg-2">
- <html:text property="city" maxlength="128"
styleClass="form-control" styleId="city"/>
- </div>
- </div>
+ <div class="form-group">
+ <label for="city" class="col-lg-3
control-label">
+ <bean:message key="sdc.details.edit.city"/>
+ </label>
+ <div class="col-lg-2">
+ <html:text property="city"
maxlength="128" styleClass="form-control"
styleId="city"/>
+ </div>
+ </div>
- <div class="form-group">
- <label for="state" class="col-lg-3
control-label">
- <bean:message key="sdc.details.edit.state"/>
- </label>
- <div class="col-lg-2">
- <html:text property="state" maxlength="60"
styleClass="form-control" styleId="state"/>
- </div>
- </div>
+ <div class="form-group">
+ <label for="state" class="col-lg-3
control-label">
+ <bean:message key="sdc.details.edit.state"/>
+ </label>
+ <div class="col-lg-2">
+ <html:text property="state"
maxlength="60" styleClass="form-control"
styleId="state"/>
+ </div>
+ </div>
- <div class="form-group">
- <label for="country" class="col-lg-3
control-label">
- <bean:message key="sdc.details.edit.country"/>
- </label>
- <div class="col-lg-2">
- <html:select property="country"
styleId="country" styleClass="form-control">
- <html:options collection="countries"
property="value" labelProperty="label" />
- </html:select>
- </div>
- </div>
-
- <div class="form-group">
- <label for="building" class="col-lg-3
control-label">
- <bean:message key="sdc.details.edit.building"/>
- </label>
- <div class="col-lg-1">
- <html:text property="building" maxlength="128"
styleClass="form-control" styleId="building"/>
- </div>
- </div>
+ <div class="form-group">
+ <label for="country" class="col-lg-3
control-label">
+ <bean:message
key="sdc.details.edit.country"/>
+ </label>
+ <div class="col-lg-2">
+ <html:select property="country"
styleId="country" styleClass="form-control">
+ <html:options collection="countries"
property="value" labelProperty="label" />
+ </html:select>
+ </div>
+ </div>
- <div class="form-group">
- <label for="room" class="col-lg-3
control-label">
- <bean:message key="sdc.details.edit.room"/>
- </label>
- <div class="col-lg-1">
- <html:text property="room" maxlength="32"
styleClass="form-control" styleId="room"/>
- </div>
- </div>
+ <div class="form-group">
+ <label for="building" class="col-lg-3
control-label">
+ <bean:message
key="sdc.details.edit.building"/>
+ </label>
+ <div class="col-lg-1">
+ <html:text property="building"
maxlength="128" styleClass="form-control"
styleId="building"/>
+ </div>
+ </div>
- <div class="form-group">
- <label for="rack" class="col-lg-3
control-label">
- <bean:message key="sdc.details.edit.rack"/>
- </label>
- <div class="col-lg-1">
- <html:text property="rack" maxlength="64"
styleClass="form-control" styleId="rack"/>
- </div>
- </div>
+ <div class="form-group">
+ <label for="room" class="col-lg-3
control-label">
+ <bean:message key="sdc.details.edit.room"/>
+ </label>
+ <div class="col-lg-1">
+ <html:text property="room"
maxlength="32" styleClass="form-control"
styleId="room"/>
+ </div>
+ </div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <button type="submit" class="btn
btn-success">
- <bean:message key="sdc.details.edit.update"/>
- </button>
- </div>
- </div>
- </html:form>
+ <div class="form-group">
+ <label for="rack" class="col-lg-3
control-label">
+ <bean:message key="sdc.details.edit.rack"/>
+ </label>
+ <div class="col-lg-1">
+ <html:text property="rack"
maxlength="64" styleClass="form-control"
styleId="rack"/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <button type="submit" class="btn
btn-success">
+ <bean:message
key="sdc.details.edit.update"/>
+ </button>
+ </div>
+ </div>
+ </html:form>
</div>
</div>
</body>
commit e5cd035ca230203a3cda4483f7395f8c7fa336da
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Dec 12 16:47:20 2013 +0100
Fix display of notifications checkboxes on system properties page
Indentation is still a bit messed up though.
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp
b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp
index bdb832c..8509f03 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp
@@ -88,18 +88,22 @@
<bean:message
key="sdc.details.edit.notifications.unentitled"/>
</c:when>
<c:otherwise>
- <label for="receive_notifications">
- <html:checkbox
property="receive_notifications" styleId="receive_notifications"/>
- <bean:message
key="sdc.details.edit.updates"/>
- </label>
- <label for="summary">
- <html:checkbox
property="include_in_daily_summary" styleId="summary"/>
- <bean:message
key="sdc.details.edit.summary"/>
- </label>
- </c:otherwise>
- </c:choose>
- </div>
- </div>
+ <div class="checkbox">
+ <label
for="receive_notifications">
+ <html:checkbox
property="receive_notifications" styleId="receive_notifications"/>
+ <strong><bean:message
key="sdc.details.edit.updates"/></strong>
+ </label>
+ </div>
+ <div class="checkbox">
+ <label for="summary">
+ <html:checkbox
property="include_in_daily_summary" styleId="summary"/>
+ <strong><bean:message
key="sdc.details.edit.summary"/></strong>
+ </label>
+ </div>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
<div class="form-group">
<label class="col-lg-3 control-label"
for="autoerrataupdate">
commit a35efec298add1a1b8aad26258ddf14fcaf71848
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Fri Dec 6 14:25:43 2013 +0100
Use the right shield icon for security errata
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
index 3c2052a..086d70f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
@@ -17,7 +17,7 @@
<rhn:listdisplay button="deleteconfirm.jsp.confirm">
<rhn:column header="erratalist.jsp.type">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <i class="fa fa-shield"></i>
</c:if>
<c:if test="${current.bugFix}">
<i class="fa fa-bug"></i>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
index 51a5020..d9b8b4e 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
@@ -36,7 +36,7 @@
<td>${enhance_count}</td>
</tr>
<tr>
- <th><i class="fa fa-lock" title="<bean:message
key='erratalist.jsp.securityadvisory'/>"></i>
+ <th><i class="fa fa-shield" title="<bean:message
key='erratalist.jsp.securityadvisory'/>"></i>
Security Advisory:
</th>
<td>${secure_count}</td>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
index 2e129b0..abd9d75 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
@@ -4,7 +4,7 @@
<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
<c:if test="${errata.securityAdvisory}">
- <rhn:toolbar base="h1" icon="fa-lock"
+ <rhn:toolbar base="h1" icon="fa-shield"
iconAlt="errata-legend.jsp.security"
helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s3-sm-errata-details">
<c:if test="${empty errata}">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf
index 76ba418..c3a3d42 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf
@@ -2,7 +2,7 @@
<rhn:listdisplay button="deleteconfirm.jsp.confirm">
<rhn:column header="erratalist.jsp.type">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <i class="fa fa-shield"></i>
</c:if>
<c:if test="${current.bugFix}">
<i class="fa fa-bug"></i>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
index 012eb28..88bed3e 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
@@ -12,7 +12,7 @@
<rl:column headerkey="erratalist.jsp.type">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock" title="<bean:message
key='erratalist.jsp.securityadvisory'/>"></i>
+ <i class="fa fa-shield" title="<bean:message
key='erratalist.jsp.securityadvisory'/>"></i>
</c:if>
<c:if test="${current.bugFix}">
<i class="fa fa-bug" title="<bean:message
key='erratalist.jsp.bugadvisory'/>"></i>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
index 217f5ec..5f5a7b4 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
@@ -8,7 +8,7 @@
<rl:column headerkey="erratalist.jsp.type"
styleclass="text-align: left;">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock" title="<bean:message
key='erratalist.jsp.securityadvisory'/>"></i>
+ <i class="fa fa-shield" title="<bean:message
key='erratalist.jsp.securityadvisory'/>"></i>
</c:if>
<c:if test="${current.bugFix}">
<i class="fa fa-bug" title="<bean:message
key='erratalist.jsp.bugadvisory'/>"></i>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp
b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp
index 4451d25..e7059eb 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp
@@ -14,7 +14,7 @@
description="yourrhn.jsp.relevanterrata.description">
<rhn:column header="yourrhn.jsp.securityerrata">
- <i class="fa fa-lock" title="<bean:message
key='errata-legend.jsp.security'/>"></i>
+ <i class="fa fa-shield" title="<bean:message
key='errata-legend.jsp.security'/>"></i>
<a
href="/rhn/errata/details/Details.do?eid=${current.id}">${current.advisoryName}</a>
</rhn:column>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
index 4ebed53..81efcf0 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
@@ -32,7 +32,7 @@
<rl:column headerkey="yourrhn.jsp.criticalsystems.securityerrata"
headerclass="row-2 text-align: center;">
- <i class="fa fa-lock" title="<bean:message
key='errata-legend.jsp.security'/>"></i>${current.securityErrata}
+ <i class="fa fa-shield" title="<bean:message
key='errata-legend.jsp.security'/>"></i>${current.securityErrata}
</rl:column>
<rl:column headerkey="yourrhn.jsp.criticalsystems.bugfixerrata"
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index 7a1f9db..0f6b3cc 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -82,7 +82,7 @@
</div>
<div class="checkbox">
<html:checkbox property="errata_type_security">
- <i class="fa fa-lock"></i>
+ <i class="fa fa-shield"></i>
<bean:message
key="erratalist.jsp.securityadvisory"/>
</html:checkbox>
</div>
@@ -167,7 +167,7 @@
<rl:column bound="false" sortable="true"
sortattr="securityAdvisory"
headerkey="erratalist.jsp.type">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <i class="fa fa-shield"></i>
</c:if>
<c:if test="${current.bugFix}">
<i class="fa fa-bug"></i>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
index f147469..5c4c620 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
@@ -53,7 +53,7 @@
<rl:column headerkey="ssm.package.upgrade.select.advisory"
bound="false">
<c:if test="${not empty current.advisory}">
<c:if test="${current.advisoryType == 'Security
Advisory'}">
- <i class="fa fa-lock" title="<bean:message
key='erratalist.jsp.securityadvisory' />"></i>
+ <i class="fa fa-shield" title="<bean:message
key='erratalist.jsp.securityadvisory' />"></i>
</c:if>
<c:if test="${current.advisoryType == 'Bug Fix
Advisory'}">
<i class="fa fa-bug" title="<bean:message
key='erratalist.jsp.bugadvisory' />"></i>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
index 1cfec32..e2796b9 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
@@ -39,7 +39,7 @@
<rl:column headerkey="erratalist.jsp.type"
styleclass="text-align: center;" bound="false">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <i class="fa fa-shield"></i>
</c:if>
<c:if test="${current.bugFix}">
<i class="fa fa-bug"></i>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
index a1cc508..4c8d772 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
@@ -53,7 +53,7 @@
<c:forEach items="${current.errata}" var="errata">
<c:if test="${not empty errata.advisory}">
<c:if test="${errata.type == 'Security Advisory'}">
- <i class="fa fa-lock" title="<bean:message
key='erratalist.jsp.securityadvisory' />"></i>
+ <i class="fa fa-shield" title="<bean:message
key='erratalist.jsp.securityadvisory' />"></i>
</c:if>
<c:if test="${errata.type == 'Bug Fix Advisory'}">
<i class="fa fa-bug" title="<bean:message
key='erratalist.jsp.bugadvisory' />"></i>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp
b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
index 351bdf1..83e826c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
@@ -82,7 +82,7 @@
<rl:column headerkey="erratalist.jsp.type" styleclass="text-align:
center;"
bound="false">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <i class="fa fa-shield"></i>
</c:if>
<c:if test="${current.bugFix}">
<i class="fa fa-bug"></i>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
index 1e499b6..6cfc789 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
@@ -31,7 +31,7 @@
<rl:column headerkey="erratalist.jsp.type" styleclass="text-align:
center;">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <i class="fa fa-shield"></i>
</c:if>
<c:if test="${current.bugFix}">
<i class="fa fa-bug"></i>
commit 27b52cc4743162ef43106a09bf2f0bcc9c3df502
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Tue Dec 10 12:35:12 2013 +0100
Id added to the Language div in the section Create New User
diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
index ca03d30..c2838e0 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
@@ -142,7 +142,7 @@
</div>
</div>
</div>
- <div class="panel panel-default">
+ <div class="panel panel-default" id="new-user-language">
<div class="panel-heading">
<h4><bean:message key="preferences.jsp.lang" /></h4>
</div>
commit 3f9aa94477aa3300868891c1303599cefa12816b
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Dec 10 22:35:21 2013 +0100
Refactor the List tag to get rid of the complicated state handled by
bools, keeping only the commands as state.
Fixes lot of bugs:
- unclosed tr tags
- missing tbody tag
Update the testcase so that the right states are generated. It passes
now.
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java
index 8942173..f0a84a8 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java
@@ -21,12 +21,14 @@ package com.redhat.rhn.frontend.taglibs.list;
*/
public enum ListCommand {
- RENDER ("__render__"),
+ ENUMERATE ("__enum__"),
TBL_HEADING ("__tbl_heading__"),
TBL_ADDONS ("__tbl_addons__"),
- TBL_FOOTER ("__tbl__footer__"),
COL_HEADER ("__col_header__"),
- ENUMERATE ("__enum__");
+ BEFORE_RENDER ("__tbl__before_render__"),
+ RENDER ("__render__"),
+ AFTER_RENDER ("__tbl__after_render__"),
+ TBL_FOOTER("__tbl_footer__");
private String _cmd;
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
index 05c04d1..ef33e12 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
@@ -62,11 +62,6 @@ public class ListTag extends BodyTagSupport {
"backward", "forward", "allForward" };
private static final String HIDDEN_TEXT = "<input type=\"hidden\"
" +
"name=\"%s\"
value=\"%s\"/>";
- private boolean haveColsEnumerated = false;
- private boolean haveTblHeadingRendered = false;
- private boolean haveTblAddonsRendered = false;
- private boolean haveTblFootersRendered = false;
- private boolean haveColHeadersRendered = false;
private int columnCount;
private int pageSize = -1;
@@ -430,6 +425,9 @@ public class ListTag extends BodyTagSupport {
}
private void doAfterBodyRenderTopAddons() throws JspException {
+ ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
+ ListCommand.TBL_ADDONS);
+
setupManipulator();
manip.sort();
pageData = manip.getPage();
@@ -568,8 +566,7 @@ public class ListTag extends BodyTagSupport {
manip.bindPaginationInfo();
request.setAttribute("dataSize", String
.valueOf(pageData.size() + 1));
- ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
- ListCommand.TBL_ADDONS);
+
if (pageData != null && pageData.size() > 0) {
iterator = pageData.iterator();
}
@@ -578,10 +575,13 @@ public class ListTag extends BodyTagSupport {
}
}
- private int doAfterBodyRenderFooter() throws JspException {
+ private int doAfterBodyRenderBeforeData() throws JspException {
ListTagUtil.write(pageContext, "</tr>");
ListTagUtil.write(pageContext, "</thead>");
+ ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
+ ListCommand.BEFORE_RENDER);
+
if (manip.isListEmpty()) {
renderEmptyList();
ListTagUtil.write(pageContext, "</table>");
@@ -592,8 +592,22 @@ public class ListTag extends BodyTagSupport {
return BodyTagSupport.SKIP_BODY;
}
+ ListTagUtil.write(pageContext, "<tbody>");
+
+ // render first row. The rest will be rendered in subsequent
+ // calls to doAfterBody
+ return doAfterBodyRenderData();
+ }
+
+ private int doAfterBodyRenderData() throws JspException {
+ // if there was a previous object, close its row
+ if (currentObject != null) {
+ ListTagUtil.write(pageContext, "</tr>");
+ }
+
ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
ListCommand.RENDER);
+
if (iterator.hasNext()) {
Object obj = iterator.next();
if (RhnListTagFunctions.isExpandable(obj)) {
@@ -604,32 +618,43 @@ public class ListTag extends BodyTagSupport {
else {
currentObject = null;
}
- if (currentObject == null) {
- ListTagUtil.write(pageContext, "</tbody>");
- ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
- ListCommand.TBL_FOOTER);
- }
- else {
+
+ if (currentObject != null) {
ListTagUtil.write(pageContext, "<tr");
renderRowClassAndId();
ListTagUtil.write(pageContext, ">");
pageContext.setAttribute(rowName, currentObject);
}
+ else {
+ return doAfterBodyRenderAfterData();
+ }
+ return BodyTagSupport.EVAL_BODY_AGAIN;
+ }
+
+ private int doAfterBodyRenderAfterData() throws JspException {
+ ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
+ ListCommand.AFTER_RENDER);
+ ListTagUtil.write(pageContext, "</tr>");
+ ListTagUtil.write(pageContext, "</tbody>");
return BodyTagSupport.EVAL_BODY_AGAIN;
}
private void doAfterBodyRenderColHeaders() throws JspException {
startTable();
+ ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
+ ListCommand.COL_HEADER);
+
ListTagUtil.write(pageContext, "<thead>");
// open the row tag for the column header th's
ListTagUtil.write(pageContext, "<tr>");
- ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
- ListCommand.COL_HEADER);
}
private int doAfterBodyRenderFooterAddons() throws JspException {
ListTagUtil.write(pageContext, "</table>");
+ ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
+ ListCommand.TBL_FOOTER);
+
// as the footer addons are populated with decorators, we don't
// know if there will be content or not, but we want to avoid
// writing the tfoot tag at all if there is none, so we push a
@@ -735,6 +760,9 @@ public class ListTag extends BodyTagSupport {
}
private void doAfterBodyRenderListBegin() throws JspException {
+ ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
+ ListCommand.TBL_HEADING);
+
ListTagUtil.write(pageContext, "<!-- START LIST " + getUniqueName()
+ " -->");
String listId = (getStyleId() != null) ? getStyleId() : getUniqueName();
@@ -748,8 +776,6 @@ public class ListTag extends BodyTagSupport {
ListTagUtil.write(pageContext, " " + styleClass);
}
ListTagUtil.write(pageContext, "\" id=\"" + listId +
"\">");
- ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
- ListCommand.TBL_HEADING);
}
/**
@@ -759,29 +785,16 @@ public class ListTag extends BodyTagSupport {
public int doAfterBody() throws JspException {
int retval = BodyTagSupport.EVAL_BODY_AGAIN;
- ListCommand cmd = ListTagUtil.getCurrentCommand(this, pageContext);
+ ListCommand nextCmd = getNextCommand();
- if (cmd.equals(ListCommand.COL_HEADER)) {
- ListTagUtil.write(pageContext, "</tr>");
- }
-
- setState();
-
- if (haveColsEnumerated && !haveTblHeadingRendered) {
- doAfterBodyRenderListBegin();
- }
- else if (haveColsEnumerated && !haveTblAddonsRendered) {
- doAfterBodyRenderTopAddons();
- }
- if (haveColsEnumerated && haveTblAddonsRendered &&
- !haveColHeadersRendered) {
- doAfterBodyRenderColHeaders();
- }
- if (haveColHeadersRendered && !haveTblFootersRendered) {
- retval = doAfterBodyRenderFooter();
- }
- else if (haveTblFootersRendered) {
- retval = doAfterBodyRenderFooterAddons();
+ switch (nextCmd) {
+ case TBL_HEADING: doAfterBodyRenderListBegin(); break;
+ case TBL_ADDONS: doAfterBodyRenderTopAddons(); break;
+ case COL_HEADER: doAfterBodyRenderColHeaders(); break;
+ case BEFORE_RENDER: retval = doAfterBodyRenderBeforeData(); break;
+ case RENDER: retval = doAfterBodyRenderData(); break;
+ case AFTER_RENDER: retval = doAfterBodyRenderAfterData(); break;
+ case TBL_FOOTER: retval = doAfterBodyRenderFooterAddons(); break;
}
return retval;
}
@@ -930,11 +943,6 @@ public class ListTag extends BodyTagSupport {
pageSize = -1;
rowName = "current";
filter = null;
- haveColsEnumerated = false;
- haveColHeadersRendered = false;
- haveTblAddonsRendered = false;
- haveTblFootersRendered = false;
- haveTblHeadingRendered = false;
getDecorators().clear();
decorators = null;
decoratorName = null;
@@ -1000,22 +1008,17 @@ public class ListTag extends BodyTagSupport {
ListTagUtil.write(pageContext, ">");
}
- private void setState() {
+ private ListCommand getNextCommand() {
ListCommand cmd = ListTagUtil.getCurrentCommand(this, pageContext);
- if (cmd.equals(ListCommand.ENUMERATE)) {
- haveColsEnumerated = true;
- }
- else if (cmd.equals(ListCommand.TBL_HEADING)) {
- haveTblHeadingRendered = true;
- }
- else if (cmd.equals(ListCommand.TBL_ADDONS)) {
- haveTblAddonsRendered = true;
- }
- else if (cmd.equals(ListCommand.COL_HEADER)) {
- haveColHeadersRendered = true;
- }
- else if (cmd.equals(ListCommand.TBL_FOOTER)) {
- haveTblFootersRendered = true;
+ switch (cmd) {
+ case ENUMERATE: return ListCommand.TBL_HEADING;
+ case TBL_HEADING: return ListCommand.TBL_ADDONS;
+ case TBL_ADDONS: return ListCommand.COL_HEADER;
+ case COL_HEADER: return ListCommand.BEFORE_RENDER;
+ case BEFORE_RENDER: return ListCommand.RENDER;
+ case RENDER: return ListCommand.RENDER;
+ case AFTER_RENDER: return ListCommand.TBL_FOOTER;
+ default: return null;
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java
index 5659ffc..e45f0e6 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java
@@ -90,7 +90,7 @@ public class SpanTag extends TagSupport {
if (cmd.equals(ListCommand.TBL_ADDONS) &&
role.equals("header")) {
renderHeader(parent);
}
- else if (cmd.equals(ListCommand.TBL_FOOTER) &&
role.equals("footer")) {
+ else if (cmd.equals(ListCommand.BEFORE_RENDER) &&
role.equals("footer")) {
renderFooter(parent);
}
return TagSupport.EVAL_PAGE;
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java
index dff15b3..8ebb30d 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.frontend.taglibs.list.ListSetTag;
import com.redhat.rhn.frontend.taglibs.list.ListTag;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.RhnMockJspWriter;
+import java.io.Writer;
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
@@ -103,17 +104,27 @@ public class ListTagTest extends MockObjectTestCase {
.with(eq("current"), isA(Object.class));
mcontext.expects(atLeastOnce()).method("getAttribute")
.with(eq("current")).will(returnValue(null));
+ mcontext.expects(atLeastOnce()).method("pushBody")
+ .with(isA(Writer.class));
+ mcontext.expects(atLeastOnce()).method("popBody")
+ .withNoArguments();
mreq.expects(atLeastOnce()).method("getParameter")
.with(stringContains("PAGE_SIZE_LABEL_SELECTED")).will(returnValue(null));
Stub[] cmdValues = {
returnValue(ListCommand.ENUMERATE), // listtag asking
returnValue(ListCommand.ENUMERATE), // columntag asking
+ returnValue(ListCommand.TBL_HEADING), // listtag asking
+ returnValue(ListCommand.TBL_HEADING), // columntag asking
returnValue(ListCommand.TBL_ADDONS), // listtag asking
returnValue(ListCommand.TBL_ADDONS), // columntag asking
returnValue(ListCommand.COL_HEADER), // listtag asking
returnValue(ListCommand.COL_HEADER), // columntag asking
+ returnValue(ListCommand.BEFORE_RENDER), // listtag asking
+ returnValue(ListCommand.BEFORE_RENDER), // columntag asking
returnValue(ListCommand.RENDER), // listtag asking
returnValue(ListCommand.RENDER), // columntag asking
+ returnValue(ListCommand.AFTER_RENDER), // listtag asking
+ returnValue(ListCommand.AFTER_RENDER), // columntag asking
returnValue(ListCommand.TBL_FOOTER), // listtag asking
returnValue(ListCommand.TBL_FOOTER) // columntag asking
};