Add UI option to enable/disable data forwarding to SCC

uyuni-project · Dec 19, 2024 · 781a516 · 781a516
1 parent 5f6577c
commit 781a516
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
@@ -59,7 +59,9 @@ public class GeneralConfigAction extends BaseConfigAction {
         ConfigDefaults.HTTP_PROXY_USERNAME, ConfigDefaults.HTTP_PROXY_PASSWORD,
         ConfigDefaults.MOUNT_POINT};
 
-    private static final String[] BOOLEAN_CONFIG_ARRAY = { ConfigDefaults.DISCONNECTED };
+    private static final String[] BOOLEAN_CONFIG_ARRAY = { ConfigDefaults.DISCONNECTED,
+        ConfigDefaults.FORWARD_REGISTRATION
+    };
 
     private static final List<String> ALLOWED_CONFIGS = new LinkedList<>();
     static {

diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -9517,8 +9517,7 @@ For a detailed analysis, please refer to the log files.</source>
       <trans-unit id="notification.sccoptoutwarning.detail" xml:space="preserve">
         <source>
           &lt;p&gt;Disabling data synchronizing with SCC will lead to reduced visibility of your managed clients between RMT, SMT, @@PRODUCT_NAME@@ and SCC-directly registered clients.
-          By synchronizing data, you ensure a uniform view of all registered clients. Please consider enabling data forwarding again by changing the 'server.susemanager.forward_registration'
-          property in the rhn.conf file.&lt;/p&gt;
+          By synchronizing data, you ensure a uniform view of all registered clients. &lt;a href="/rhn/admin/config/GeneralConfig.do"&gt;Enable data forwarding&lt;/a&gt;.&lt;/p&gt;
           &lt;a href="https://suselinux.fra1.qualtrics.com/jfe/form/SV_0ooNnrY0rYuQScS" target="_blank"&gt;Help us improve our services by sharing your reason for opting out&lt;/a&gt;
         </source>
       </trans-unit>

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
@@ -8603,6 +8603,12 @@ administrator privileges.</source>
           <context context-type="sourcefile">/rhn/admin/config/GeneralConfig.do</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="general.jsp.scc_data_forwarding" xml:space="preserve">
+        <source>Synchronize client registration data with SCC</source>
+            <context-group name="ctx">
+          <context context-type="sourcefile">/rhn/admin/config/GeneralConfig.do</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="config.update" xml:space="preserve">
         <source>Update</source>
         <context-group name="ctx">

diff --git a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
@@ -90,6 +90,17 @@
                                        styleId="mount_point" />
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label for="forward_registration" class="col-lg-3 control-label">
+                            <bean:message key="general.jsp.scc_data_forwarding"/>
+                        </label>
+                        <div class="col-lg-6">
+                            <div class="checkbox">
+                                <html:checkbox property="server|susemanager|forward_registration"
+                                               styleId="forward_registration" />
+                            </div>
+                        </div>
+                    </div>
                     <div class="form-group hidden">
                         <label class="col-lg-3 control-label" for="disconnected">
                             <bean:message key="general.jsp.disconnected"/>

diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
@@ -368,6 +368,7 @@
             <form-property name="server|satellite|http_proxy_password"  type="java.lang.String"/>
             <form-property name="server|satellite|http_proxy_password_confirm"  type="java.lang.String"/>
             <form-property name="mount_point"  type="java.lang.String"/>
+            <form-property name="server|susemanager|forward_registration"  type="java.lang.Boolean"/>
             <form-property name="disconnected"  type="java.lang.Boolean"/>
             <form-property name="submitted"  type="java.lang.Boolean"/>
             <form-property name="no_scrub" type="java.lang.String"