Merge pull request #51 from jenkinsci/jenkins-35130

[FIXED JENKINS-35130] Delete and Move credentials do not work with providers that do not have modifiable domains
jenkinsci · May 25, 2016 · be60a05 · be60a05
2 parents 4b409d8 + 28d6d45
commit be60a05
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java b/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java
@@ -1008,9 +1008,6 @@ public CredentialsStore getStore() {
         @Restricted(NoExternalUse.class)
         @SuppressWarnings("unused") // stapler web method
         public HttpResponse doDoDelete(StaplerRequest req) throws IOException {
-            if (!getStore().isDomainsModifiable()) {
-                return HttpResponses.status(400);
-            }
             getStore().checkPermission(DELETE);
             if (getStore().removeCredentials(domain.getDomain(), credentials)) {
                 return HttpResponses.redirectTo("../..");
@@ -1030,7 +1027,7 @@ public HttpResponse doDoDelete(StaplerRequest req) throws IOException {
         @Restricted(NoExternalUse.class)
         @SuppressWarnings("unused") // stapler web method
         public HttpResponse doDoMove(StaplerRequest req, @QueryParameter String destination) throws IOException {
-            if (!getStore().isDomainsModifiable()) {
+            if (getStore().getDomains().size() <= 1) {
                 return HttpResponses.status(400);
             }
             // TODO switch to Jenkins.getInstance() once 2.0+ is the baseline