Merge remote-tracking branch 'upstream/master'

nilovna · Aug 26, 2014 · b86e65f · b86e65f
2 parents 70d984b + 8fa37c1
commit b86e65f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/app/js/controllers.js b/app/app/js/controllers.js
@@ -86,7 +86,7 @@ angular.module('myApp.controllers', [])
           /* here we override $scope.box.output, which is the value computed by Shinken
              in the business rule. If the checks have runned again but not the bp_rule,
              the value is outdated and different results are displayed in the page. */
-          $scope.box.output = (nbProblems123 > 0 ? (nbProblems123.toString() + 'problème' + (nbProblems123 > 1 : 's' : '') : 'ok');
+          $scope.box.output = (nbProblems123 > 0 ? (nbProblems123.toString() + 'problème' + (nbProblems123 > 1 ? 's' : '') : 'ok');
 
           /* let's create the map */
           if ($scope.box.display_map) {