From f18ebea03e395ecc0c53c4125834085cfa38b560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 5 Jun 2017 18:01:16 +0200
Subject: [PATCH] fix: dashboard save modals had double submit on enter after
 my refactoring this morning

---
 pkg/services/sqlstore/dashboard.go             | 1 -
 public/app/features/dashboard/save_as_modal.ts | 8 ++++----
 public/app/features/dashboard/save_modal.ts    | 7 -------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go
index 961349c6b98..d3f3c115ca3 100644
--- a/pkg/services/sqlstore/dashboard.go
+++ b/pkg/services/sqlstore/dashboard.go
@@ -142,7 +142,6 @@ func GetDashboard(query *m.GetDashboardQuery) error {
 
 	dashboard.Data.Set("id", dashboard.Id)
 	query.Result = &dashboard
-
 	return nil
 }
 
diff --git a/public/app/features/dashboard/save_as_modal.ts b/public/app/features/dashboard/save_as_modal.ts
index 22382f2867d..0be82755e41 100644
--- a/public/app/features/dashboard/save_as_modal.ts
+++ b/public/app/features/dashboard/save_as_modal.ts
@@ -15,19 +15,19 @@ const  template = `
 		</a>
 	</div>
 
-	<div class="modal-content">
+	<form name="ctrl.saveForm" ng-submit="ctrl.save()" class="modal-content" novalidate>
 		<div class="p-t-2">
 			<div class="gf-form">
 				<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 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>
 		</div>
-	</div>
+	</form>
 </div>
 `;
 
diff --git a/public/app/features/dashboard/save_modal.ts b/public/app/features/dashboard/save_modal.ts
index 8c08aa9a1db..01a42655a5f 100644
--- a/public/app/features/dashboard/save_modal.ts
+++ b/public/app/features/dashboard/save_modal.ts
@@ -29,7 +29,6 @@ const  template = `
 						ng-model="ctrl.message"
 						ng-model-options="{allowInvalid: true}"
 						ng-maxlength="this.max"
-						ng-keydown="ctrl.keyDown($event)"
 						autocomplete="off"
 						required />
 					<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);
   }
-
-  keyDown(evt) {
-    if (evt.keyCode === 13) {
-      this.save();
-    }
-  }
 }
 
 export function saveDashboardModalDirective() {