Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2229 from fbelzunc/JENKINS-32340-v2
[JENKINS-32340] Enable disabled dependencies
  • Loading branch information
daniel-beck committed May 1, 2016
2 parents bc1c2ca + a596152 commit 59f0664
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
6 changes: 6 additions & 0 deletions core/src/main/resources/hudson/PluginManager/_table.js
Expand Up @@ -173,6 +173,12 @@ Behaviour.specify("#filter-box", '_table', 0, function(e) {

function setEnableWidgetStates() {
for (var i = 0; i < pluginTRs.length; i++) {
var pluginMetadata = pluginTRs[i].jenkinsPluginMetadata;
if (pluginTRs[i].hasClassName('has-dependants-but-disabled')) {
if (pluginMetadata.enableInput.checked) {
pluginTRs[i].removeClassName('has-dependants-but-disabled');
}
}
markAllDependantsDisabled(pluginTRs[i]);
markHasDisabledDependencies(pluginTRs[i]);
}
Expand Down
Expand Up @@ -68,7 +68,7 @@ THE SOFTWARE.
<th width="1">${%Uninstall}</th>
</tr>
<j:forEach var="p" items="${app.pluginManager.plugins}">
<tr class="plugin ${p.hasDependants()?'has-dependants':''} ${p.isDeleted()?'deleted':''}" data-plugin-id="${p.shortName}" data-plugin-name="${p.displayName}">
<tr class="plugin ${p.hasDependants()?'has-dependants':''} ${(p.hasDependants() &amp;&amp; !p.enabled)?'has-dependants-but-disabled':''} ${p.isDeleted()?'deleted':''}" data-plugin-id="${p.shortName}" data-plugin-name="${p.displayName}">
<j:set var="state" value="${p.enabled?'true':null}"/>
<td class="center pane enable" data="${state}">
<input type="checkbox" checked="${state}" onclick="flip(event)"
Expand Down
6 changes: 6 additions & 0 deletions war/src/main/webapp/css/style.css
Expand Up @@ -1424,6 +1424,12 @@ TABLE.fingerprint-in-build TD {
opacity: 0.2;
}

#plugins tr.has-dependants-but-disabled .enable input {
pointer-events: auto;
opacity: 1.0;
visibility: visible;
}

#plugins tr.has-disabled-dependency .enable input {
opacity: 0.4;
}
Expand Down

0 comments on commit 59f0664

Please sign in to comment.