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
3b9fbd60
Commit
3b9fbd60
authored
Aug 28, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux: fix for showing pending invitations tab, fixes #9094
parent
ad14ccf4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
public/app/features/org/org_users_ctrl.ts
+5
-0
public/app/features/org/partials/orgUsers.html
+3
-3
No files found.
public/app/features/org/org_users_ctrl.ts
View file @
3b9fbd60
...
...
@@ -92,6 +92,10 @@ export class OrgUsersCtrl {
evt
.
stopPropagation
();
}
getInviteUrl
(
invite
)
{
return
invite
.
url
;
}
openAddUsersView
()
{
var
modalScope
=
this
.
$scope
.
$new
();
modalScope
.
invitesSent
=
this
.
get
.
bind
(
this
);
...
...
@@ -106,6 +110,7 @@ export class OrgUsersCtrl {
scope
:
modalScope
});
}
}
coreModule
.
controller
(
'OrgUsersCtrl'
,
OrgUsersCtrl
);
public/app/features/org/partials/orgUsers.html
View file @
3b9fbd60
...
...
@@ -22,7 +22,7 @@
Users ({{ctrl.users.length}})
</a>
</li>
<li
class=
"gf-tabs-item"
ng-show=
"ctrl.
showInviteUI
"
>
<li
class=
"gf-tabs-item"
ng-show=
"ctrl.
pendingInvites.length
"
>
<a
class=
"gf-tabs-link"
ng-click=
"ctrl.editor.index = 1"
ng-class=
"{active: ctrl.editor.index === 1}"
>
Pending Invitations ({{ctrl.pendingInvites.length}})
</a>
...
...
@@ -66,7 +66,7 @@
</table>
</div>
<div
ng-if=
"ctrl.editor.index === 1
&& ctrl.showInviteUI
"
>
<div
ng-if=
"ctrl.editor.index === 1"
>
<table
class=
"filter-table form-inline"
>
<thead>
<tr>
...
...
@@ -80,7 +80,7 @@
<td>
{{invite.email}}
</td>
<td>
{{invite.name}}
</td>
<td
class=
"text-right"
>
<button
class=
"btn btn-inverse btn-mini
"
data-clipboard-text=
"{{invite.url}}"
clipboard-button
ng-click=
"ctrl.copyInviteToClipboard($event)"
>
<button
class=
"btn btn-inverse btn-mini
"
clipboard-button=
"ctrl.getInviteUrl(invite)"
ng-click=
"ctrl.copyInviteToClipboard($event)"
>
<i
class=
"fa fa-clipboard"
></i>
Copy Invite
</button>
...
...
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