IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed failing test

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-12-11 13:09:25 +01:00
parent 05ec7541c8
commit a682475152
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/EmptyListCTA/__snapshots__/EmptyListCTA.jest.tsx.snap
View File

@@ -2,7 +2,7 @@
exports[`CollorPalette renders correctly 1`] = ` exports[`CollorPalette renders correctly 1`] = `
<div <div
className="empty-list-cta p-t-2 p-b-1" className="empty-list-cta"
> >
<div <div
className="empty-list-cta__title" className="empty-list-cta__title"

4
public/app/features/annotations/editor_ctrl.ts
View File

@@ -69,6 +69,10 @@ export class AnnotationsEditorCtrl {
this.reset(); this.reset();
} }
backToList() {
this.mode = 'list';
}
add() { add() {
this.annotations.push(this.currentAnnotation); this.annotations.push(this.currentAnnotation);
this.reset(); this.reset();

4
public/app/features/annotations/partials/editor.html
View File

@@ -1,7 +1,7 @@
<div ng-controller="AnnotationsEditorCtrl"> <div ng-controller="AnnotationsEditorCtrl">
<h3 class="dashboard-settings__header"> <h3 class="dashboard-settings__header">
<a ng-click="ctrl.setMode('list')">Annotations</a> <a ng-click="ctrl.backToList()">Annotations</a>
<span ng-show="ctrl.mode === 'new'">&gt; New</span> <span ng-show="ctrl.mode === 'new'">&gt; New</span>
<span ng-show="ctrl.mode === 'edit'">&gt; Edit</span> <span ng-show="ctrl.mode === 'edit'">&gt; Edit</span>
</h3> </h3>
@@ -32,7 +32,7 @@
<a type="button" class="btn btn-success" ng-click="ctrl.setupNew();"><i class="fa fa-plus" ></i> New</a> <a type="button" class="btn btn-success" ng-click="ctrl.setupNew();"><i class="fa fa-plus" ></i> New</a>
</div> </div>
<table class="filter-table"> <table class="filter-table filter-table--hover">
<thead> <thead>
<tr> <tr>
<th>Query name</th> <th>Query name</th>