Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RUN-2165: legacyXml feature flag should support defaultEnabled #8845

Merged
merged 1 commit into from
Jan 25, 2024
Merged

RUN-2165: legacyXml feature flag should support defaultEnabled #8845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion rundeckapp/grails-app/controllers/rundeck/controllers/ControllerBase.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class ControllerBase {
}

boolean isAllowXml(){
return featureService.featurePresent(Features.LEGACY_XML, false)
return featureService.featurePresent(Features.LEGACY_XML)
}

List<String> getResponseFormats(){
Expand Down
2 changes: 1 addition & 1 deletion rundeckapp/grails-app/services/rundeck/services/ExecutionService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ class ExecutionService implements ApplicationContextAware, StepExecutor, NodeSte
def renderBulkExecutionDeleteResult(request, response, result) {
def respFormat = 'json'

if(featureService.featurePresent(Features.LEGACY_XML, false)) {
if(featureService.featurePresent(Features.LEGACY_XML)) {
respFormat = apiService.extractResponseFormat(request, response, ['xml', 'json'], 'json')
}
def total = result.successTotal + result.failures.size()
Expand Down
2 changes: 1 addition & 1 deletion rundeckapp/src/main/groovy/org/rundeck/web/WebUtil.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class WebUtil implements WebUtilService, ResponseRenderer {
@Override
void renderErrorFormat(HttpServletResponse response, Map<String, Object> error) {
def handlers = new HashMap(respHandlers)
if(featureService.featurePresent(Features.LEGACY_XML,false)){
if(featureService.featurePresent(Features.LEGACY_XML)){
handlers.put('xml', this.&renderErrorXml as ResponseErrorHandler)
}
def eformat = error.format.toString()
Expand Down