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
04c88a22
Commit
04c88a22
authored
Mar 08, 2019
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor refactoring of copy tags when saving feature, #15446
parent
60272d8a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
+6
-4
public/sass/components/_tags.scss
+2
-4
No files found.
public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
View file @
04c88a22
...
...
@@ -27,9 +27,11 @@ const template = `
label-class="width-8"
dashboard-id="ctrl.clone.id">
</folder-picker>
<gf-form-switch class="gf-form" label="Preserve tags" label-class="width-8" checked="ctrl.preseveTags">
<div class="gf-form-inline">
<gf-form-switch class="gf-form" label="Copy tags" label-class="width-8" checked="ctrl.copyTags">
</gf-form-switch>
</div>
</div>
<div class="gf-form-button-row text-center">
<button type="submit" class="btn btn-primary" ng-click="ctrl.save()" ng-disabled="!ctrl.isValidFolderSelection">Save</button>
...
...
@@ -44,7 +46,7 @@ export class SaveDashboardAsModalCtrl {
folderId
:
any
;
dismiss
:
()
=>
void
;
isValidFolderSelection
=
true
;
preseve
Tags
:
boolean
;
copy
Tags
:
boolean
;
/** @ngInject */
constructor
(
private
dashboardSrv
)
{
...
...
@@ -56,7 +58,7 @@ export class SaveDashboardAsModalCtrl {
this
.
clone
.
editable
=
true
;
this
.
clone
.
hideControls
=
false
;
this
.
folderId
=
dashboard
.
meta
.
folderId
;
this
.
preseve
Tags
=
false
;
this
.
copy
Tags
=
false
;
// remove alerts if source dashboard is already persisted
// do not want to create alert dupes
...
...
@@ -73,7 +75,7 @@ export class SaveDashboardAsModalCtrl {
}
save
()
{
if
(
!
this
.
preseve
Tags
)
{
if
(
!
this
.
copy
Tags
)
{
this
.
clone
.
tags
=
[];
}
...
...
public/sass/components/_tags.scss
View file @
04c88a22
...
...
@@ -21,10 +21,8 @@
border-radius
:
3px
;
text-shadow
:
none
;
font-size
:
13px
;
padding
:
3px
6px
1px
6px
;
border-width
:
1px
;
border-style
:
solid
;
box-shadow
:
0
0
1px
rgba
(
$white
,
0
.2
);
padding
:
2px
6px
2px
6px
;
border
:
1px
solid
lighten
(
$purple
,
10%
);
.icon-tag
{
position
:
relative
;
...
...
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