diff options
4 files changed, 23 insertions, 18 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java index bb6dcdda810..d572a320bfa 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java @@ -123,7 +123,7 @@ public class MeasureFilterFactory implements ServerComponent { } } - private List<String> sortFieldLabels(){ + private List<String> sortFieldLabels() { return newArrayList(Iterables.transform(Arrays.asList(MeasureFilterSort.Field.values()), new Function<MeasureFilterSort.Field, String>() { @Override public String apply(@Nullable MeasureFilterSort.Field input) { @@ -155,22 +155,23 @@ public class MeasureFilterFactory implements ServerComponent { if (alertLevels == null || alertLevels.isEmpty()) { return null; } - MeasureFilterCondition condition = null; - String metricKey = CoreMetrics.ALERT_STATUS_KEY; - String op = "in"; + final List<String> availableLevels = Lists.transform(Arrays.asList(Metric.Level.values()), new Function<Metric.Level, String>() { + @Override + public String apply(@Nullable Metric.Level input) { + return input != null ? input.name() : null; + } + }); + List<String> alertLevelsUppercase = Lists.transform(alertLevels, new Function<String, String>() { @Override public String apply(@Nullable String input) { - return input != null ? input.toUpperCase() : ""; + return input != null && availableLevels.contains(input.toUpperCase()) ? input.toUpperCase() : null; } }); - String val = "('" + Joiner.on("', '").join(alertLevelsUppercase) + "')"; - if (!Strings.isNullOrEmpty(metricKey) && !Strings.isNullOrEmpty(op) && !Strings.isNullOrEmpty(val)) { - Metric metric = metricFinder.findByKey(metricKey); - MeasureFilterCondition.Operator operator = MeasureFilterCondition.Operator.fromCode(op); - condition = new MeasureFilterCondition(metric, operator, val); - } - return condition; + String val = "('" + Joiner.on("', '").skipNulls().join(alertLevelsUppercase) + "')"; + Metric metric = metricFinder.findByKey(CoreMetrics.ALERT_STATUS_KEY); + MeasureFilterCondition.Operator operator = MeasureFilterCondition.Operator.fromCode("in"); + return new MeasureFilterCondition(metric, operator, val); } private List<String> toList(@Nullable Object obj) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterFactoryTest.java index 20cc5872bee..cd2b01ea4a9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterFactoryTest.java @@ -195,7 +195,7 @@ public class MeasureFilterFactoryTest { public void alert_level_condition() { MeasureFilterFactory factory = new MeasureFilterFactory(newMetricFinder(), system); Map<String, Object> props = ImmutableMap.<String, Object>of( - "alertLevels", Arrays.asList("error", "warn") + "alertLevels", Arrays.asList("error", "warn", "unknown") ); MeasureFilter filter = factory.create(props); diff --git a/server/sonar-web/src/main/js/navigator/filters/action-plan-filters.js b/server/sonar-web/src/main/js/navigator/filters/action-plan-filters.js index 489cb9de39c..b906a62a864 100644 --- a/server/sonar-web/src/main/js/navigator/filters/action-plan-filters.js +++ b/server/sonar-web/src/main/js/navigator/filters/action-plan-filters.js @@ -15,6 +15,11 @@ define([ onChangeProjectFilter: function() { + var that = this; + _.each(that.model.get('choices'), function(v, k) { + that.choices.add(new Backbone.Model({ id: k, text: v })); + }); + var projects = this.projectFilter.get('value'); if (_.isArray(projects) && projects.length === 1) { return this.fetchActionPlans(projects[0]); diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/PostJob.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/PostJob.java index 52eff7acc68..a01a83178e0 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/PostJob.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/PostJob.java @@ -23,11 +23,10 @@ import org.sonar.api.BatchExtension; import org.sonar.api.resources.Project; /** - * PostJobs are executed when project is analysed. - * <p/> - * <p> - * Note : executed only on root project, not on modules. - * </p> + * PostJobs are executed at the very end of batch analysis. A PostJob can't do any modification + * since everything is already computed (issues, measures,...). <br/> + * WANRING: Do not rely on the fact that analysis results are available on server side. Even if it is true + * for now (synchronous storage) it will become an asynchronous processing on server side in 5.x series. * * @since 1.10 */ |