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

fix: dashboard save modals had double submit on enter after my refactoring this morning

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-06-05 18:01:16 +02:00
parent 82d4d54dc5
commit f18ebea03e
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/sqlstore/dashboard.go
View File

@ -142,7 +142,6 @@ func GetDashboard(query *m.GetDashboardQuery) error {
dashboard.Data.Set("id", dashboard.Id) dashboard.Data.Set("id", dashboard.Id)
query.Result = &dashboard query.Result = &dashboard
return nil return nil
} }

8
public/app/features/dashboard/save_as_modal.ts
View File

@ -15,19 +15,19 @@ const template = `
</a> </a>
</div> </div>
<div class="modal-content"> <form name="ctrl.saveForm" ng-submit="ctrl.save()" class="modal-content" novalidate>
<div class="p-t-2"> <div class="p-t-2">
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label">New name</label> <label class="gf-form-label">New name</label>
<input type="text" class="gf-form-input" ng-model="ctrl.clone.title" give-focus="true" ng-keydown="ctrl.keyDown($event)"> <input type="text" class="gf-form-input" ng-model="ctrl.clone.title" give-focus="true" required>
</div> </div>
</div> </div>
<div class="gf-form-button-row text-center"> <div class="gf-form-button-row text-center">
<a class="btn btn-success" ng-click="ctrl.save();">Save</a> <button type="submit" class="btn btn-success" ng-disabled="ctrl.saveForm.$invalid">Save</button>
<a class="btn-text" ng-click="ctrl.dismiss();">Cancel</a> <a class="btn-text" ng-click="ctrl.dismiss();">Cancel</a>
</div> </div>
</div> </form>
</div> </div>
`; `;

7
public/app/features/dashboard/save_modal.ts
View File

@ -29,7 +29,6 @@ const template = `
ng-model="ctrl.message" ng-model="ctrl.message"
ng-model-options="{allowInvalid: true}" ng-model-options="{allowInvalid: true}"
ng-maxlength="this.max" ng-maxlength="this.max"
ng-keydown="ctrl.keyDown($event)"
autocomplete="off" autocomplete="off"
required /> required />
<small class="gf-form-hint-text muted" ng-cloak> <small class="gf-form-hint-text muted" ng-cloak>
@ -73,12 +72,6 @@ export class SaveDashboardModalCtrl {
return this.dashboardSrv.save(saveModel, options).then(this.dismiss); return this.dashboardSrv.save(saveModel, options).then(this.dismiss);
} }
keyDown(evt) {
if (evt.keyCode === 13) {
this.save();
}
}
} }
export function saveDashboardModalDirective() { export function saveDashboardModalDirective() {