Merge branch 'JENKINS-22028' of github.com:daniel-beck/jenkins

core/src/main/java/hudson/security/GlobalSecurityConfiguration.java

@@ -99,15 +99,16 @@ public class GlobalSecurityConfiguration extends ManagementLink implements Descr
             } catch (IOException e) {
                 throw new hudson.model.Descriptor.FormException(e, "slaveAgentPortType");
             }
-            if (security.has("markupFormatter")) {
-                j.setMarkupFormatter(req.bindJSON(MarkupFormatter.class, security.getJSONObject("markupFormatter")));
-            } else {
-                j.setMarkupFormatter(null);
-            }
         } else {
             j.disableSecurity();
         }
 
+        if (json.has("markupFormatter")) {
+            j.setMarkupFormatter(req.bindJSON(MarkupFormatter.class, json.getJSONObject("markupFormatter")));
+        } else {
+            j.setMarkupFormatter(null);
+        }
+
         // persist all the additional security configs
         boolean result = true;
         for(Descriptor<?> d : Functions.getSortedDescriptorsForGlobalConfig(FILTER)){

core/src/main/java/jenkins/model/Jenkins.java

@@ -2081,7 +2081,6 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         useSecurity = null;
         setSecurityRealm(SecurityRealm.NO_AUTHENTICATION);
         authorizationStrategy = AuthorizationStrategy.UNSECURED;
-        markupFormatter = null;
     }
 
     public void setProjectNamingStrategy(ProjectNamingStrategy ns) {

core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy

@@ -33,8 +33,6 @@ l.layout(norefresh:true, permission:app.ADMINISTER, title:my.displayName) {
                     f.checkbox()
                 }
 
-                f.dropdownDescriptorSelector(title:_("Markup Formatter"),descriptors: MarkupFormatterDescriptor.all(), field: 'markupFormatter')
-
                 f.entry(title:_("Access Control")) {
                     table(style:"width:100%") {
                         f.descriptorRadioList(title:_("Security Realm"),varName:"realm",         instance:app.securityRealm,         descriptors:SecurityRealm.all())
@@ -43,6 +41,8 @@ l.layout(norefresh:true, permission:app.ADMINISTER, title:my.displayName) {
                 }
             }
 
+            f.dropdownDescriptorSelector(title:_("Markup Formatter"),descriptors: MarkupFormatterDescriptor.all(), field: 'markupFormatter')
+
             Functions.getSortedDescriptorsForGlobalConfig(my.FILTER).each { Descriptor descriptor ->
                 set("descriptor",descriptor)
                 set("instance",descriptor)