Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
a147015e
Commit
a147015e
authored
Jan 13, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(playlists): fixed url in playlist view when using sub url, fixes #3711
parent
44f02421
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
11 deletions
+3
-11
public/app/features/playlist/partials/playlists.html
+2
-2
public/app/features/playlist/playlists_ctrl.js
+1
-9
No files found.
public/app/features/playlist/partials/playlists.html
View file @
a147015e
...
...
@@ -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>
...
...
public/app/features/playlist/playlists_ctrl.js
View file @
a147015e
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment