[JENKINS-46033] Column ordering based on Status and JobName, missing …

…some tables in the previous fix Change-Id: Iefc139b8ab642aa206624312f9a35a5eb829232c
jenkinsci · Aug 15, 2017 · e50e059 · e50e059
1 parent 6a100a8
commit e50e059
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/resources/org/jenkins/ci/plugins/jenkinslint/JobLintAction/index.jelly b/src/main/resources/org/jenkins/ci/plugins/jenkinslint/JobLintAction/index.jelly
@@ -30,20 +30,20 @@
                     <tr>
                         <j:if test="${!lint.isActive()}">
                             <j:if test="${!lint.isEnabled()}">
-                                <td data="disabled" tooltip="disabled" style="background-color: #f0f0f0;"/>
+                                <td data="disabled-${lint.name}" tooltip="disabled" style="background-color: #f0f0f0;"/>
                             </j:if>
                             <j:if test="${lint.isEnabled()}">
                                 <j:if test="${lint.isIgnored()}">
-                                    <td data="ignored" tooltip="ignored" style="background-color: #f9ef9e;"/>
+                                    <td data="ignored-${lint.name}" tooltip="ignored" style="background-color: #f9ef9e;"/>
                                 </j:if>
                             </j:if>
                         </j:if>
                         <j:if test="${lint.isActive()}">
                             <j:if test="${lint.found}">
-                                <td data="found" tooltip="found" style="background-color: #FF8566;"/>
+                                <td data="found-${lint.name}" tooltip="found" style="background-color: #FF8566;"/>
                             </j:if>
                             <j:if test="${!lint.found}">
-                                <td data="not_found" tooltip="not_found" style="background-color: #B8EEB8;"/>
+                                <td data="not_found-${lint.name}" tooltip="not_found" style="background-color: #B8EEB8;"/>
                             </j:if>
                         </j:if>
                         <td>${lint.name}</td>

diff --git a/src/main/resources/org/jenkins/ci/plugins/jenkinslint/SlaveLintAction/index.jelly b/src/main/resources/org/jenkins/ci/plugins/jenkinslint/SlaveLintAction/index.jelly
@@ -31,20 +31,20 @@
                     <tr>
                         <j:if test="${!lint.isActive()}">
                             <j:if test="${!lint.isEnabled()}">
-                                <td data="disabled" tooltip="disabled" style="background-color: #f0f0f0;"/>
+                                <td data="disabled-${lint.name}" tooltip="disabled" style="background-color: #f0f0f0;"/>
                             </j:if>
                             <j:if test="${lint.isEnabled()}">
                                 <j:if test="${lint.isIgnored()}">
-                                    <td data="ignored" tooltip="ignored" style="background-color: #f9ef9e;"/>
+                                    <td data="ignored-${lint.name}" tooltip="ignored" style="background-color: #f9ef9e;"/>
                                 </j:if>
                             </j:if>
                         </j:if>
                         <j:if test="${lint.isActive()}">
                             <j:if test="${lint.found}">
-                                <td data="found" tooltip="found" style="background-color: #FF8566;"/>
+                                <td data="found-${lint.name}" tooltip="found" style="background-color: #FF8566;"/>
                             </j:if>
                             <j:if test="${!lint.found}">
-                                <td data="not_found" tooltip="not_found" style="background-color: #B8EEB8;"/>
+                                <td data="not_found-${lint.name}" tooltip="not_found" style="background-color: #B8EEB8;"/>
                             </j:if>
                         </j:if>
                         <td>${lint.name}</td>