Skip to content

Commit f98cf81

Browse files
committed
Migrate ResourceDomainRecommendation
1 parent 7250ce1 commit f98cf81

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

core/src/main/java/jenkins/security/ResourceDomainRecommendation.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@
2929
import hudson.model.DirectoryBrowserSupport;
3030
import hudson.security.Permission;
3131
import hudson.util.HttpResponses;
32-
import java.io.IOException;
3332
import jenkins.model.Jenkins;
3433
import jenkins.util.SystemProperties;
3534
import org.kohsuke.accmod.Restricted;
3635
import org.kohsuke.accmod.restrictions.NoExternalUse;
3736
import org.kohsuke.stapler.HttpResponse;
38-
import org.kohsuke.stapler.QueryParameter;
3937
import org.kohsuke.stapler.interceptor.RequirePOST;
4038

4139
/**
@@ -64,16 +62,9 @@ public boolean isActivated() {
6462
}
6563

6664
@RequirePOST
67-
public HttpResponse doAct(@QueryParameter String redirect, @QueryParameter String dismiss) throws IOException {
65+
public HttpResponse doConfigure() {
6866
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
69-
if (dismiss != null) {
70-
disable(true);
71-
return HttpResponses.redirectViaContextPath("manage");
72-
}
73-
if (redirect != null) {
74-
return HttpResponses.redirectViaContextPath("configure");
75-
}
76-
return HttpResponses.forwardToPreviousPage();
67+
return HttpResponses.redirectViaContextPath("configure");
7768
}
7869

7970
@Override

core/src/main/resources/jenkins/security/ResourceDomainRecommendation/message.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ dl {
3030
div(class: "jenkins-alert jenkins-alert-info") {
3131
a(name: "resource-root-url")
3232
l.isAdmin() {
33-
form(method: "post", action: "${rootURL}/${my.url}/act") {
34-
f.submit(name: 'redirect', value: _("Configure resource root URL"))
35-
f.submit(name: 'dismiss', value: _("Dismiss"))
33+
form(method: "post") {
34+
f.submit(value: _("Configure resource root URL"), action: "${rootURL}/${my.url}/configure")
35+
f.submit(value: _("Dismiss"), action: "${rootURL}/${my.url}/disable")
3636
}
3737
}
3838

0 commit comments

Comments
 (0)