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
210813f1
Commit
210813f1
authored
Jun 14, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard_folders: fixes to user picker & group picker
parent
908eb24d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
32 deletions
+18
-32
public/app/core/components/user_group_picker.ts
+7
-1
public/app/core/components/user_picker.ts
+8
-3
public/app/features/dashboard/acl/acl.html
+1
-1
public/app/features/dashboard/partials/settings.html
+2
-27
No files found.
public/app/core/components/user_group_picker.ts
View file @
210813f1
...
...
@@ -23,7 +23,13 @@ export class UserGroupPickerCtrl {
resetUserGroupSegment
()
{
this
.
userGroupId
=
null
;
const
userGroupSegment
=
this
.
uiSegmentSrv
.
newSegment
({
value
:
'Choose User Group'
,
selectMode
:
true
,
fake
:
true
});
const
userGroupSegment
=
this
.
uiSegmentSrv
.
newSegment
({
value
:
'Choose User Group'
,
selectMode
:
true
,
fake
:
true
,
cssClass
:
'gf-size-auto'
});
if
(
!
this
.
userGroupSegment
)
{
this
.
userGroupSegment
=
userGroupSegment
;
}
else
{
...
...
public/app/core/components/user_picker.ts
View file @
210813f1
...
...
@@ -17,14 +17,19 @@ export class UserPickerCtrl {
/** @ngInject */
constructor
(
private
backendSrv
,
private
$scope
,
$sce
,
private
uiSegmentSrv
)
{
this
.
userSegment
=
this
.
uiSegmentSrv
.
newSegment
({
value
:
'Choose User'
,
selectMode
:
true
,
fake
:
true
});
this
.
debouncedSearchUsers
=
_
.
debounce
(
this
.
searchUsers
,
500
,
{
'leading'
:
true
,
'trailing'
:
false
});
this
.
userId
=
null
;
this
.
resetUserSegment
();
}
resetUserSegment
()
{
const
userSegment
=
this
.
uiSegmentSrv
.
newSegment
({
value
:
'Choose User'
,
selectMode
:
true
,
fake
:
true
});
this
.
userId
=
null
;
const
userSegment
=
this
.
uiSegmentSrv
.
newSegment
({
value
:
'Choose User'
,
selectMode
:
true
,
fake
:
true
,
cssClass
:
'gf-size-auto'
});
if
(
!
this
.
userSegment
)
{
this
.
userSegment
=
userSegment
;
}
else
{
...
...
public/app/features/dashboard/acl/acl.html
View file @
210813f1
<div
class=
"editor-row"
>
<h3
class=
"page-heading"
>
Add New Permission
</h3
>
<h5
class=
"section-heading"
>
Add New Permission
</h5
>
<form
name=
"addPermission"
class=
"gf-form-group"
>
<div
class=
"gf-form-inline"
>
<div
class=
"gf-form"
>
...
...
public/app/features/dashboard/partials/settings.html
View file @
210813f1
...
...
@@ -4,7 +4,7 @@
</h2>
<ul
class=
"gf-tabs"
>
<li
class=
"gf-tabs-item"
ng-repeat=
"tab in ::['General', 'Rows', 'Links', 'Time picker', '
Metadata', '
Permissions']"
>
<li
class=
"gf-tabs-item"
ng-repeat=
"tab in ::['General', 'Rows', 'Links', 'Time picker', 'Permissions']"
>
<a
class=
"gf-tabs-link"
ng-click=
"editor.index = $index"
ng-class=
"{active: editor.index === $index}"
>
{{::tab}}
</a>
...
...
@@ -118,32 +118,7 @@
</div>
<div
ng-if=
"editor.index == 4"
>
<h5
class=
"section-heading"
>
Dashboard info
</h5>
<div
class=
"gf-form-group"
>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label width-10"
>
Last updated at:
</span>
<span
class=
"gf-form-label width-18"
>
{{dashboard.formatDate(dashboardMeta.updated)}}
</span>
</div>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label width-10"
>
Last updated by:
</span>
<span
class=
"gf-form-label width-18"
>
{{dashboardMeta.updatedBy}}
</span>
</div>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label width-10"
>
Created at:
</span>
<span
class=
"gf-form-label width-18"
>
{{dashboard.formatDate(dashboardMeta.created)}}
</span>
</div>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label width-10"
>
Created by:
</span>
<span
class=
"gf-form-label width-18"
>
{{dashboardMeta.createdBy}}
</span>
</div>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label width-10"
>
Current version:
</span>
<span
class=
"gf-form-label width-18"
>
{{dashboardMeta.version}}
</span>
</div>
</div>
</div>
<div
ng-if=
"editor.index == 5"
>
<acl-settings
dashboard=
"dashboard"
></acl-settings>
</div>
</div>
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