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
ca06893e
Commit
ca06893e
authored
Aug 08, 2018
by
Patrick O'Carroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed mock-teams, now gets teams from backend
parent
beddfdd8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
public/app/features/org/partials/profile.html
+1
-3
public/app/features/org/profile_ctrl.ts
+3
-7
No files found.
public/app/features/org/partials/profile.html
View file @
ca06893e
...
@@ -32,13 +32,11 @@
...
@@ -32,13 +32,11 @@
<thead>
<thead>
<tr>
<tr>
<th>
Name
</th>
<th>
Name
</th>
<th>
Members
</th>
</tr>
</tr>
</thead>
</thead>
<tbody>
<tbody>
<tr
ng-repeat=
"team in ctrl.
user.
teams"
>
<tr
ng-repeat=
"team in ctrl.teams"
>
<td>
{{team.name}}
</td>
<td>
{{team.name}}
</td>
<td>
{{team.members}}
</td>
</tr>
</tr>
</tbody>
</tbody>
</table>
</table>
...
...
public/app/features/org/profile_ctrl.ts
View file @
ca06893e
...
@@ -28,13 +28,9 @@ export class ProfileCtrl {
...
@@ -28,13 +28,9 @@ export class ProfileCtrl {
}
}
getUserTeams
()
{
getUserTeams
()
{
this
.
backendSrv
.
get
(
'/api/user'
).
then
(
teams
=>
{
this
.
backendSrv
.
get
(
'/api/user/teams'
).
then
(
teams
=>
{
this
.
user
.
teams
=
[
this
.
teams
=
teams
;
{
name
:
'Backend'
,
email
:
'backend@grafana.com'
,
members
:
5
},
this
.
showTeamsList
=
this
.
teams
.
length
>
1
;
{
name
:
'Frontend'
,
email
:
'frontend@grafana.com'
,
members
:
4
},
{
name
:
'Ops'
,
email
:
'ops@grafana.com'
,
members
:
6
},
];
this
.
showTeamsList
=
this
.
user
.
teams
.
length
>
1
;
});
});
}
}
...
...
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