From a147015e9651c53de5fb5bf344e86b068166cc76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 13 Jan 2016 10:36:00 +0100
Subject: [PATCH] fix(playlists): fixed url in playlist view when using sub
 url, fixes #3711

---
 public/app/features/playlist/partials/playlists.html |  4 ++--
 public/app/features/playlist/playlists_ctrl.js       | 10 +---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/public/app/features/playlist/partials/playlists.html b/public/app/features/playlist/partials/playlists.html
index e424f1a2d88..fcf888b7aa9 100644
--- a/public/app/features/playlist/partials/playlists.html
+++ b/public/app/features/playlist/partials/playlists.html
@@ -22,10 +22,10 @@
           {{playlist.title}}
         </td>
         <td >
-          <a href="{{ playlistUrl(playlist) }}">{{ playlistUrl(playlist) }}</a>
+					<a href="playlists/play/{{playlist.id}}">playlists/play/{{playlist.id}}</a>
         </td>
         <td class="text-center">
-          <a href="{{ playlistUrl(playlist) }}" class="btn btn-inverse btn-mini">
+          <a href="playlists/play/{{playlist.id}}" class="btn btn-inverse btn-mini">
             <i class="fa fa-play"></i>
             Play
           </a>
diff --git a/public/app/features/playlist/playlists_ctrl.js b/public/app/features/playlist/playlists_ctrl.js
index 092bb00f56c..b4bc464825c 100644
--- a/public/app/features/playlist/playlists_ctrl.js
+++ b/public/app/features/playlist/playlists_ctrl.js
@@ -7,20 +7,12 @@ function (angular, _) {
 
   var module = angular.module('grafana.controllers');
 
-  module.controller('PlaylistsCtrl', function(
-    $scope,
-    $location,
-    backendSrv
-  ) {
+  module.controller('PlaylistsCtrl', function($scope, $location, backendSrv) {
     backendSrv.get('/api/playlists')
       .then(function(result) {
         $scope.playlists = result;
       });
 
-    $scope.playlistUrl = function(playlist) {
-      return '/playlists/play/' + playlist.id;
-    };
-
     $scope.removePlaylist = function(playlist) {
       var modalScope = $scope.$new(true);