IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 23:16:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring of copy tags when saving feature, #15446

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-03-08 14:24:45 +01:00
parent 60272d8a77
commit 04c88a226b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
View File

@ -26,9 +26,11 @@ const template = `
enable-create-new="true"
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">
</gf-form-switch>
</folder-picker>
<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">
@ -44,7 +46,7 @@ export class SaveDashboardAsModalCtrl {
folderId: any;
dismiss: () => void;
isValidFolderSelection = true;
preseveTags: boolean;
copyTags: 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.preseveTags = false;
this.copyTags = 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.preseveTags) {
if (!this.copyTags) {
this.clone.tags = [];
}

6
public/sass/components/_tags.scss
View File

@ -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;