Master show client payg UI api

java/code/src/com/redhat/rhn/common/security/acl/Access.java

@@ -607,4 +607,21 @@ public boolean aclSystemSupportsPtfRemoval(Map<String, Object> ctx, String[] par
             ServerFactory.isPtfUninstallationSupported(server);
     }
 
+    /**
+     * Checks if a system is Pay-as-you-go
+     * @param ctx acl context
+     * @param params parameters for acl
+     * @return true if the system is Pay-as-you-go
+     */
+    public boolean aclSystemIsPayg(Map<String, Object> ctx, String[] params) {
+        Long sid = getAsLong(ctx.get("sid"));
+        User user = (User) ctx.get("user");
+
+        Server server = SystemManager.lookupByIdAndUser(sid, user);
+        if (server == null) {
+            return false;
+        }
+
+        return server.isPayg();
+    }
 }

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml

@@ -20787,6 +20787,18 @@ The Tree Path, Base Channel, and Installer Generation should always match. This
           <context context-type="sourcefile">/systems/details/Overview.do</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="sdc.details.overview.payg" xml:space="preserve">
+        <source>Pay-as-you-go:</source>
+          <context-group name="ctx">
+            <context context-type="sourcefile">/systems/details/Overview.do</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="sdc.details.overview.payg_msg" xml:space="preserve">
+        <source>This is a Pay-as-you-go server</source>
+          <context-group name="ctx">
+            <context context-type="sourcefile">/systems/details/Overview.do</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="sdc.details.overview.activationkey" xml:space="preserve">
         <source>Activation Key:</source>
         <context-group name="ctx">

java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java

@@ -39,6 +39,7 @@
  *         #prop_desc("int", "id", "system ID")
  *         #prop("string", "profile_name")
  *         #prop("string", "machine_id")
+ *         #prop_desc("boolean", "payg", "Whether the server instance is payg or not")
  *         #prop("string", "minion_id")
  *         #prop_desc("string", "base_entitlement", "system's base entitlement label")
  *
@@ -86,7 +87,8 @@ public SerializedApiResponse serialize(Server src) {
                 .add("profile_name", src.getName())
                 .add("machine_id", src.getMachineId())
                 .add("hostname", src.getHostname())
-                .add("minion_id", src.getMinionId());
+                .add("minion_id", src.getMinionId())
+                .add("payg", src.isPayg());
 
         // Find this server's base entitlement:
         String baseEntitlement = EntitlementManager.UNENTITLED;

java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java

@@ -816,6 +816,7 @@ private Date convertLocalToUtc(Date in) {
      *     #struct_begin("server details")
      *       #prop_desc("int", "id", "The server's id")
      *       #prop_desc("string", "name", "The server's name")
+     *       #prop_desc("boolean", "payg", "Whether the server instance is payg or not")
      *       #prop_desc("string", "minion_id", "The server's minion id, in case it is a salt minion client")
      *       #prop_desc("$date", "last_checkin",
      *         "Last time server successfully checked in (in UTC)")
@@ -885,6 +886,8 @@ public List<Map<String, Object>> listActiveSystemsDetails(
                 }
                 m.put("subscribed_channels", channels);
 
+                m.put("payg", server.isPayg());
+
                 Collection<VirtualInstance> guests = server.getGuests();
                 List<Long> guestList = new ArrayList<>();
                 for (VirtualInstance guest : guests) {

java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp

@@ -200,6 +200,17 @@
             </td>
           </tr>
           </rhn:require>
+          <!-- PAYG info -->
+          <rhn:require acl="system_is_payg()">
+          <tr>
+            <td>
+              <bean:message key="sdc.details.overview.payg"/>
+            </td>
+            <td>
+              <rhn:icon type="system-ok" title="sdc.details.overview.payg_msg"/>
+            </td>
+          </tr>
+          </rhn:require>
           <tr>
             <td><bean:message key="sdc.details.overview.sysid"/></td>
             <td><c:out value="${system.id}" /></td>

java/spacewalk-java.changes.mikeletux.22205

@@ -0,0 +1 @@
+- Add payg info to UI and rest API