java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java
| 3 +
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
| 18 ++++++++++
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
| 8 ++--
3 files changed, 26 insertions(+), 3 deletions(-)
New commits:
commit c3641e5dbecba58d471ad021b1a3b69433238a37
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Nov 7 16:09:07 2012 +0100
OrgSoftwareSubscribtions CSV export
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java
index 28f3038..04307a8 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java
@@ -115,6 +115,9 @@ public class OrgSoftwareSubscriptionsAction extends RhnAction
implements Listabl
request.getSession().removeAttribute(makeLabel(request));
}
}
+
+ request.setAttribute(RequestContext.PAGE_LIST, helper.getDataSet());
+
return retval;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 7ac0c31..102c04b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -18170,6 +18170,24 @@ given channel.</source>
<trans-unit id="provider">
<source>Content Provider</source>
</trans-unit>
+ <trans-unit id="currentMembers">
+ <source>Regular Usage - Used</source>
+ </trans-unit>
+ <trans-unit id="maxMembers">
+ <source>Regular Usage - Alloted</source>
+ </trans-unit>
+ <trans-unit id="maxAvailable">
+ <source>Regular Proposed Total</source>
+ </trans-unit>
+ <trans-unit id="currentFlex">
+ <source>Flex Usage - Used</source>
+ </trans-unit>
+ <trans-unit id="maxFlex">
+ <source>Flex Usage - Allotted</source>
+ </trans-unit>
+ <trans-unit id="maxAvailableFlex">
+ <source>Flex Proposed Total</source>
+ </trans-unit>
<trans-unit id="channel.jsp.package.viewpackages">
<source>View Packages</source>
</trans-unit>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
index 486dd0a..9085629 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
@@ -46,7 +46,8 @@
<rhn:submitted/>
<input type="hidden" name="oid"
value="${param.oid}"/>
- <rl:list
+ <rl:list dataset="pageList"
+ name="entitlement"
alphabarcolumn="name"
styleclass="list"
emptykey="orgsoftwaresubs.jsp.nochannelfams">
@@ -93,7 +94,6 @@
</rl:column>
<rl:column styleclass="center"
headertext="${rhn:localize('Flex Usage')}
<br/>(${rhn:localize('Used/Allotted')})*">
-
<c:choose>
<c:when test="${empty current.maxFlex or current.maxFlex ==
0}">
<bean:message key="None Allocated"/>
@@ -130,6 +130,9 @@
</c:choose>
</rl:column>
</rl:list>
+ <rl:csv dataset="pageList"
+ name="entitlement"
+ exportColumns="name,currentMembers,maxMembers,maxAvailable,currentFlex,maxFlex,maxAvailableFlex"
/>
<p><rhn:tooltip>*-<bean:message key =
"Used/Allotted.tip"/></rhn:tooltip></p>
<c:if test="${param.oid != 1}">
<div align="right">
@@ -140,7 +143,6 @@
</rl:listset>
</div>
-
</body>
</html>
Show replies by date