Merge branch 'urldecode' of github.com:axe-felix/grafana into axe-felix-urldecode

src/app/directives/grafanaGraph.js

@@ -314,7 +314,7 @@ function (angular, $, kbn, moment, _) {
             if (seriesInfo.alias) {
             if (seriesInfo.alias) {
               group = '<small style="font-size:0.9em;">' +
               group = '<small style="font-size:0.9em;">' +
                 '<i class="icon-circle" style="color:'+item.series.color+';"></i>' + ' ' +
                 '<i class="icon-circle" style="color:'+item.series.color+';"></i>' + ' ' +
-                (seriesInfo.alias || seriesInfo.query)+
+                (decodeURIComponent(seriesInfo.alias) || seriesInfo.query)+
               '</small><br>';
               '</small><br>';
             } else {
             } else {
               group = kbn.query_color_dot(item.series.color, 15) + ' ';
               group = kbn.query_color_dot(item.series.color, 15) + ' ';

src/app/filters/all.js

@@ -114,4 +114,10 @@ define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, m
     };
     };
   });
   });
 
 
+  module.filter('urlDecode', function() {
+    return function(input) {
+      return decodeURIComponent(input);
+    };
+ });
+
 });
 });
\ No newline at end of file

src/app/panels/filtering/module.html

@@ -17,7 +17,7 @@
             </a>
             </a>
               <ul class="dropdown-menu">
               <ul class="dropdown-menu">
                 <li ng-repeat="option in filter.options">
                 <li ng-repeat="option in filter.options">
-                  <a ng-click="filterOptionSelected(filter, option)">{{option.text}}</a>
+                  <a ng-click="filterOptionSelected(filter, option)">{{option.text | urlDecode}}</a>
                 </li>
                 </li>
               </ul>
               </ul>
           </li>
           </li>

src/app/panels/graphite/legend.html

@@ -9,7 +9,7 @@
     </i>
     </i>
     <span class='small histogram-legend-item'>
     <span class='small histogram-legend-item'>
       <a ng-click="toggleSeries(series, $event)" data-unique="1" data-placement="{{series.yaxis === 2 ? 'bottomRight' : 'bottomLeft'}}">
       <a ng-click="toggleSeries(series, $event)" data-unique="1" data-placement="{{series.yaxis === 2 ? 'bottomRight' : 'bottomLeft'}}">
-        {{series.alias}}
+        {{series.alias | urlDecode }}
       </a>
       </a>
       <span ng-if="panel.legend.values">
       <span ng-if="panel.legend.values">
         <span ng-show="panel.legend.current">
         <span ng-show="panel.legend.current">

src/app/partials/graphite/editor.html

@@ -70,7 +70,7 @@
           </a>
           </a>
           <ul class="dropdown-menu scrollable grafana-segment-dropdown-menu" role="menu">
           <ul class="dropdown-menu scrollable grafana-segment-dropdown-menu" role="menu">
             <li ng-repeat="altSegment in altSegments" role="menuitem">
             <li ng-repeat="altSegment in altSegments" role="menuitem">
-              <a href="javascript:void(0)" tabindex="1" ng-click="setSegment($index, $parent.$index)" ng-bind-html-unsafe="altSegment.html"></a>
+              <a href="javascript:void(0)" tabindex="1" ng-click="setSegment($index, $parent.$index)" ng-bind-html-unsafe="altSegment.html | urlDecode"></a>
             </li>
             </li>
           </ul>
           </ul>
         </li>
         </li>