[Spacewalk-devel] [PATCH] Fix to remove message on entitlement consumption for virt guest subscribed to cloned channels

[Paresh Mutha]

Hello,

Attached a proposed patch which removes the message on entitlement 
consumption for virtual guest subscribed to cloned channels. 
(subscribing to cloned channels doesn't consume channel entitlements).

Have created a bugzilla for RHN Satellite v5.4 - 
https://bugzilla.redhat.com/show_bug.cgi?id=692797

Regards,
Paresh
>From e4ea9c9741c37e3cab92aec78aef78a7680a1283 Mon Sep 17 00:00:00 2001
From: Paresh Mutha <pmu...@redhat.com>
Date: Fri, 1 Apr 2011 13:33:28 +0530
Subject: [PATCH] Fix to remove message on entitlement consumption for virt guest
 subscribed to cloned channels
 Signed-off-by: Paresh Mutha <pmu...@redhat.com>

---
 .../webapp/WEB-INF/pages/systems/sdc/channels.jsp  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp 
b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
index 67c6044..6ed6023 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
@@ -44,7 +44,7 @@
                     <c:if test="${not channel.subscribed}">
                       <input ${disabledChannel} name="child_channel" 
value="${channel.id}" type="checkbox" id="unchecked">
                     </c:if>
-                    <c:if test="${not channel.freeForGuests && 
system.virtualGuest}">
+                    <c:if test="${not channel.freeForGuests && 
system.virtualGuest && channel.availableSubscriptions != null}">
                       <span class="asterisk">*&nbsp;</span>
                     </c:if>
                     <a 
href="/rhn/channels/ChannelDetail.do?cid=${channel.id}">${channel.name}</a>
@@ -61,7 +61,7 @@
           </ul>
         </c:otherwise>
       </c:choose>
-      <c:if test="${system.virtualGuest}">
+      <c:if test="${system.virtualGuest && channel.availableSubscriptions != 
null}">
         <c:if test="${not empty system.virtualInstance.hostSystem.id}">
           <span class="asterisk">*&nbsp;</span><bean:message 
key="sdc.channels.edit.virtsubwarning" 
arg0="${system.virtualInstance.hostSystem.id}"
             arg1="${system.virtualInstance.hostSystem.name}"/>
-- 
1.7.4

_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel