Update help text for the custom repo filter field (bsc#1217874)

uyuni-project · Jan 23, 2024 · c24e77b · c24e77b
1 parent 1851297
commit c24e77b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
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
@@ -9025,7 +9025,16 @@ Please note that some manual configuration of these scripts may still be require
         <source>Filters</source>
       </trans-unit>
       <trans-unit id="repos.jsp.filters.tip" xml:space="preserve">
-        <source>-zsh*,kernel +zsh-html</source>
+          <source>
+              &lt;strong&gt;Filter syntax:&lt;/strong&gt; &lt;code&gt;[+-]keyword[,keyword ...]&lt;/code&gt;&lt;br/&gt;
+              Use &lt;strong&gt;'+'&lt;/strong&gt; to include only the package names matching the keyword and
+              &lt;strong&gt;'-'&lt;/strong&gt; to exclude the package names matching the keyword. Multiple filters can be
+              separated with spaces. Filters are evaluated in the order that they are specified. Shell-style wildcards
+              are supported.&lt;br/&gt;&lt;br/&gt;
+              &lt;strong&gt;Example:&lt;/strong&gt; &lt;code&gt;+zsh*,kernel* -zsh-html&lt;/code&gt;&lt;br/&gt;
+              &lt;em&gt;* Only include packages named &lt;code&gt;zsh*&lt;/code&gt; and &lt;code&gt;kernel*&lt;/code&gt;,
+              except &lt;code&gt;zsh-html&lt;/code&gt;&lt;/em&gt;
+          </source>
       </trans-unit>
       <trans-unit id="repos.jsp.filters.error" xml:space="preserve">
         <source>Filter syntax is incorrect!</source>

diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
@@ -112,7 +112,7 @@
                         <div class="col-lg-6">
                             <html:text property="filters" styleClass="form-control"/>
                             <span class="help-block">
-                                <rhn:tooltip key="repos.jsp.filters.tip"/>
+                                <bean:message key="repos.jsp.filters.tip"/>
                             </span>
                         </div>
             </div>

diff --git a/java/spacewalk-java.changes.cbbayburt.bsc1217874 b/java/spacewalk-java.changes.cbbayburt.bsc1217874
@@ -0,0 +1 @@
+- Update help text for the custom repo filter field (bsc#1217874)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Update help text for the custom repo filter field (bsc#1217874)