mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-09 01:56:03 +00:00
[FIXED JENKINS-17087] getSortedDescriptorsForGlobalConfigUnclassified needed to avoid clobbering GlobalCrumbIssuerConfiguration in Jenkins.doConfigSubmit.
This commit is contained in:
1 parent
8bfeaf7219
commit
ebd8ff1f0d
4 files changed
+30
-4
No files matched your search
@@ -782,6 +782,7 @@ public class Functions {
|
||||
*
|
||||
* @param predicate
|
||||
* Filter the descriptors based on {@link GlobalConfigurationCategory}
|
||||
* @since 1.494
|
||||
*/
|
||||
public static Collection<Descriptor> getSortedDescriptorsForGlobalConfig(Predicate<GlobalConfigurationCategory> predicate) {
|
||||
ExtensionList<Descriptor> exts = Jenkins.getInstance().getExtensionList(Descriptor.class);
|
||||
@@ -807,13 +808,32 @@ public class Functions {
|
||||
return DescriptorVisibilityFilter.apply(Jenkins.getInstance(),answer);
|
||||
}
|
||||
|
||||
/**
|
||||
* Like {@link #getSortedDescriptorsForGlobalConfig(Predicate)} but with a constant truth predicate, to include all descriptors.
|
||||
*/
|
||||
public static Collection<Descriptor> getSortedDescriptorsForGlobalConfig() {
|
||||
return getSortedDescriptorsForGlobalConfig(Predicates.<GlobalConfigurationCategory>alwaysTrue());
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated This is rather meaningless.
|
||||
*/
|
||||
@Deprecated
|
||||
public static Collection<Descriptor> getSortedDescriptorsForGlobalConfigNoSecurity() {
|
||||
return getSortedDescriptorsForGlobalConfig(Predicates.not(GlobalSecurityConfiguration.FILTER));
|
||||
}
|
||||
|
||||
/**
|
||||
* Like {@link #getSortedDescriptorsForGlobalConfig(Predicate)} but for unclassified descriptors only.
|
||||
* @since 1.506
|
||||
*/
|
||||
public static Collection<Descriptor> getSortedDescriptorsForGlobalConfigUnclassified() {
|
||||
return getSortedDescriptorsForGlobalConfig(new Predicate<GlobalConfigurationCategory>() {
|
||||
public boolean apply(GlobalConfigurationCategory cat) {
|
||||
return cat instanceof GlobalConfigurationCategory.Unclassified;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static class Tag implements Comparable<Tag> {
|
||||
double ordinal;
|
||||
|
||||
Reference in new issue
Block a user