MAAS

Merge ~newell-jensen/maas:lp1683794-1524120 into maas:master

  1. Git
  2. lp:~newell-jensen/maas
  3. lp1683794-1524120
  4. Merge into master
Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: 4ea3fd65855c16e42156fc51685a272ddd517583
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~newell-jensen/maas:lp1683794-1524120
Merge into: maas:master
Diff against target: 804 lines (+82/-82)
18 files modified
src/maasserver/static/partials/boot-images.html (+3/-3)
src/maasserver/static/partials/dashboard.html (+1/-1)
src/maasserver/static/partials/domain-details.html (+3/-3)
src/maasserver/static/partials/domains-list.html (+1/-1)
src/maasserver/static/partials/fabric-details.html (+4/-4)
src/maasserver/static/partials/ipranges.html (+3/-3)
src/maasserver/static/partials/networks-list.html (+4/-4)
src/maasserver/static/partials/node-details.html (+26/-26)
src/maasserver/static/partials/nodes-list.html (+7/-7)
src/maasserver/static/partials/pod-details.html (+2/-2)
src/maasserver/static/partials/pods-list.html (+2/-2)
src/maasserver/static/partials/settings.html (+6/-6)
src/maasserver/static/partials/space-details.html (+4/-4)
src/maasserver/static/partials/ssh-keys.html (+1/-1)
src/maasserver/static/partials/subnet-details.html (+7/-7)
src/maasserver/static/partials/vlan-details.html (+3/-3)
src/maasserver/static/partials/zone-details.html (+4/-4)
src/maasserver/static/partials/zones-list.html (+1/-1)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
MAAS Lander Needs Fixing
Review via email: mp+334628@code.launchpad.net

Commit message

LP: #1683794, #1524120 -- Do not allow the user to cancel input in the UI by hitting the <enter> key.

Description of the change

By adding type="button" to the button element in the html, it makes it so you cannot cancel by hitting the <enter> key. This good hint was taken from:

https://stackoverflow.com/questions/23955895/how-to-prevent-form-submit-on-enter-key-press-using-angular-js

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp1683794-1524120 lp:~newell-jensen/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/862/console
COMMIT: 8f61cecc8ea1a62fdf8bbcde465e04bba96bea61

review: Needs Fixing
Revision history for this message
Alberto Donato (ack) wrote :

LGTM +1

minimal comments inline

review: Approve
~newell-jensen/maas:lp1683794-1524120 updated
4ea3fd6... by Newell Jensen

Review fixes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/boot-images.html b/src/maasserver/static/partials/boot-images.html
2index 5506775..a88f5fe 100644
3--- a/src/maasserver/static/partials/boot-images.html
4+++ b/src/maasserver/static/partials/boot-images.html
5@@ -161,7 +161,7 @@
6 <p><span class="icon icon--warning u-margin--right-small"></span>Are you sure you want to remove this image?</p>
7 </div>
8 <div class="table__data u-float--right">
9- <button class="button--base button--inline" data-ng-click="deleteImage()">Cancel</button>
10+ <button class="button--base button--inline" type="button" data-ng-click="deleteImage()">Cancel</button>
11 <button class="button--destructive button--inline" data-ng-click="confirmDeleteImage()">Remove</button>
12 </div>
13 </div>
14@@ -324,7 +324,7 @@
15 <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to remove this image?</p>
16 </div>
17 <div class="table__data u-float--right">
18- <a class="button--base button--inline" data-ng-click="cancelRemove()">Cancel</a>
19+ <button class="button--base button--inline" type="button" data-ng-click="cancelRemove()">Cancel</a>
20 <button class="button--destructive button--inline" data-ng-click="confirmRemove(image)">Remove</button>
21 </div>
22 </div>
23@@ -384,7 +384,7 @@
24 <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to remove this image?</p>
25 </div>
26 <div class="table__data u-float--right">
27- <a class="button--base button--inline" data-ng-click="cancelRemove()">Cancel</a>
28+ <button class="button--base button--inline" type="button" data-ng-click="cancelRemove()">Cancel</a>
29 <button class="button--destructive button--inline" data-ng-click="confirmRemove(image)">Remove</button>
30 </div>
31 </div>
32diff --git a/src/maasserver/static/partials/dashboard.html b/src/maasserver/static/partials/dashboard.html
33index a34ce18..4b1876a 100644
34--- a/src/maasserver/static/partials/dashboard.html
35+++ b/src/maasserver/static/partials/dashboard.html
36@@ -166,7 +166,7 @@
37 <maas-obj-errors></maas-obj-errors>
38 </div>
39 <div class="table__data u-float--right">
40- <button class="button--base button--inline" data-ng-click="toggleSelected(selectedDevice)">Cancel</button>
41+ <button class="button--base button--inline" type="button" data-ng-click="toggleSelected(selectedDevice)">Cancel</button>
42 <button class="button--secondary button--inline"
43 data-ng-click="convertTo.goTo = true"
44 data-ng-if="!convertTo.$maasForm.getValue('parent')"
45diff --git a/src/maasserver/static/partials/domain-details.html b/src/maasserver/static/partials/domain-details.html
46index 70c9938..3fde9eb 100644
47--- a/src/maasserver/static/partials/domain-details.html
48+++ b/src/maasserver/static/partials/domain-details.html
49@@ -19,7 +19,7 @@
50 Domain cannot be deleted because it has resource records. Remove all resource records from the domain to allow deletion.
51 </p>
52 <div class="page-header__controls">
53- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
54+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
55 </div>
56 </div>
57 <div class="page-header__section ng-hide" data-ng-show="canBeDeleted() && !error">
58@@ -27,7 +27,7 @@
59 Are you sure you want to delete this domain?
60 </p>
61 <div class="page-header__controls">
62- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
63+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
64 <button class="button--destructive button--inline" data-ng-click="deleteConfirmButton()">Delete domain</button>
65 </div>
66 </div>
67@@ -36,7 +36,7 @@
68 {$ error $}
69 </p>
70 <div class="page-header__controls">
71- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
72+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
73 <button class="button--secondary button--inline" data-ng-click="deleteConfirmButton()">Retry</button>
74 </div>
75 </div>
76diff --git a/src/maasserver/static/partials/domains-list.html b/src/maasserver/static/partials/domains-list.html
77index 4c6181a..7724157 100644
78--- a/src/maasserver/static/partials/domains-list.html
79+++ b/src/maasserver/static/partials/domains-list.html
80@@ -29,7 +29,7 @@
81 </div>
82 <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
83 <div class="page-header__controls">
84- <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
85+ <button class="button--base button--inline" type="button" data-ng-click="cancel()">Cancel</button>
86 <button class="button--secondary button--inline"
87 data-ng-class="{ disabled: domainHasError() }"
88 data-ng-click="save(true)">Save and add another</button>
89diff --git a/src/maasserver/static/partials/fabric-details.html b/src/maasserver/static/partials/fabric-details.html
90index b71229b..66bf6e5 100644
91--- a/src/maasserver/static/partials/fabric-details.html
92+++ b/src/maasserver/static/partials/fabric-details.html
93@@ -20,7 +20,7 @@
94 Fabric cannot be deleted because it is the default fabric.
95 </p>
96 <div class="page-header__controls">
97- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
98+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
99 </div>
100 </section>
101 <section class="page-header__section ng-hide" data-ng-show="canBeDeleted() && !error">
102@@ -28,14 +28,14 @@
103 Are you sure you want to delete this fabric?
104 </p>
105 <div class="page-header__controls">
106- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
107+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
108 <button class="button--destructive button--inline" data-ng-click="deleteConfirmButton()">Delete fabric</button>
109 </div>
110 </section>
111 <section class="page-header__section ng-hide" data-ng-show="canBeDeleted() && error">
112 <p class="page-header__message page-header__message--error">{$ error $}</p>
113 <div class="page-header__controls">
114- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
115+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
116 <button class="button--secondary button--inline" data-ng-click="deleteConfirmButton()">Retry</button>
117 </div>
118 </section>
119@@ -83,7 +83,7 @@
120 </dl>
121 </fieldset>
122 <div class="twelve-col u-align--right">
123- <button class="button--base button--inline"
124+ <button class="button--base button--inline" type="button"
125 data-ng-click="exitEditSummary()">Cancel</button>
126 <button class="button--positive button--inline" maas-obj-save>Save summary</button>
127 </div>
128diff --git a/src/maasserver/static/partials/ipranges.html b/src/maasserver/static/partials/ipranges.html
129index 8f73e60..3cdd4d5 100755
130--- a/src/maasserver/static/partials/ipranges.html
131+++ b/src/maasserver/static/partials/ipranges.html
132@@ -34,7 +34,7 @@
133 <p><span class="icon icon--warning u-margin--right-small"></span>Ensure all in-use IP addresses are registered in MAAS before releasing this range to avoid potential collisions. Are you sure you want to remove this IP range?</p>
134 </div>
135 <div class="table__data u-float--right">
136- <button class="button--base button--inline" data-ng-click="ipRangeCancelDelete()">Cancel</button>
137+ <button class="button--base button--inline" type="button" data-ng-click="ipRangeCancelDelete()">Cancel</button>
138 <button class="button--destructive button--inline" data-ng-click="ipRangeConfirmDelete()">Remove</button>
139 </div>
140 </div>
141@@ -70,7 +70,7 @@
142 <maas-obj-errors></maas-obj-errors>
143 </div>
144 <div class="table__data u-float--right">
145- <button class="button--base button--inline" data-ng-click="ipRangeToggleEditMode(iprange)">Cancel</button>
146+ <button class="button--base button--inline" type="button" data-ng-click="ipRangeToggleEditMode(iprange)">Cancel</button>
147 <button class="button--positive button--inline" maas-obj-save>Save</button>
148 </div>
149 </div>
150@@ -112,7 +112,7 @@
151 <maas-obj-errors></maas-obj-errors>
152 </div>
153 <div class="table__data u-float--right">
154- <button class="button--base button--inline" data-ng-click="cancelAddRange()">Cancel</button>
155+ <button class="button--base button--inline" type="button" data-ng-click="cancelAddRange()">Cancel</button>
156 <button class="button--positive button--inline" maas-obj-save>Reserve</button>
157 </div>
158 </div>
159diff --git a/src/maasserver/static/partials/networks-list.html b/src/maasserver/static/partials/networks-list.html
160index a68283f..49dfe80 100644
161--- a/src/maasserver/static/partials/networks-list.html
162+++ b/src/maasserver/static/partials/networks-list.html
163@@ -23,7 +23,7 @@
164 <maas-obj-errors></maas-obj-errors>
165 </fieldset>
166 <div class="page-header__controls">
167- <button class="button--base button--inline" data-ng-click="cancelAction()">Cancel</button>
168+ <button class="button--base button--inline" type="button" data-ng-click="cancelAction()">Cancel</button>
169 <button class="button--positive button--inline" maas-obj-save>Add fabric</button>
170 </div>
171 </maas-obj-form>
172@@ -49,7 +49,7 @@
173 <maas-obj-errors></maas-obj-errors>
174 </fieldset>
175 <div class="page-header__controls">
176- <button class="button--base button--inline" data-ng-click="cancelAction()">Cancel</button>
177+ <button class="button--base button--inline" type="button" data-ng-click="cancelAction()">Cancel</button>
178 <button class="button--positive button--inline" maas-obj-save>Add VLAN</button>
179 </div>
180 </maas-obj-form>
181@@ -64,7 +64,7 @@
182 <maas-obj-errors></maas-obj-errors>
183 </fieldset>
184 <div class="page-header__controls">
185- <button class="button--base button--inline" data-ng-click="cancelAction()">Cancel</button>
186+ <button class="button--base button--inline" type="button" data-ng-click="cancelAction()">Cancel</button>
187 <button class="button--positive button--inline" maas-obj-save>Add space</button>
188 </div>
189 </maas-obj-form>
190@@ -101,7 +101,7 @@
191 <section class="page-header__section twelve-col u-margin--bottom-none">
192 <maas-obj-errors class="page-header__message page-header__message--error"></maas-obj-errors>
193 <div class="page-header__controls">
194- <button class="button--base button--inline" data-ng-click="cancelAction()">Cancel</button>
195+ <button class="button--base button--inline" type="button" data-ng-click="cancelAction()">Cancel</button>
196 <button class="button--positive button--inline" maas-obj-save>Add subnet</button>
197 </div>
198 </section>
199diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
200index 3741be9..7bfc38a 100755
201--- a/src/maasserver/static/partials/node-details.html
202+++ b/src/maasserver/static/partials/node-details.html
203@@ -23,7 +23,7 @@
204 data-ng-options="domain as domain.name for domain in header.domain.options">
205 </select>
206 </h1>
207- <button class="button--base button--inline u-margin--bottom-small ng-hide"
208+ <button class="button--base button--inline u-margin--bottom-small ng-hide" type="button"
209 data-ng-show="header.editing || header.editing_domain"
210 data-ng-click="cancelEditHeader()">Cancel</button>
211 <button class="button--positive button--inline u-margin--bottom-small ng-hide"
212@@ -86,7 +86,7 @@
213 </div>
214 </fieldset>
215 <div class="page-header__controls" data-ng-if="action.option.name !== 'commission' && action.option.name !== 'test'">
216- <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
217+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel()">Cancel</button>
218 <button class="button--inline" data-ng-class="action.option.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="actionGo('nodes')" data-ng-hide="hasActionsFailed('nodes')">
219 <span data-ng-if="action.option.name === 'acquire'">Acquire {$ type_name $}</span>
220 <span data-ng-if="action.option.name === 'deploy'">Deploy {$ type_name $}</span>
221@@ -131,7 +131,7 @@
222 <div class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="isActionError() || isDeployError() || isSSHKeyError() || hasActionPowerError(action.option.name)" data-ng-if="action.option.name === 'commission' || action.option.name === 'test'">
223 <form class="form form--inline">
224 <div class="page-header__controls">
225- <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
226+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel()">Cancel</button>
227 <button class="button--inline" data-ng-class="action.option.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="actionGo('nodes')" data-ng-hide="hasActionsFailed('nodes')">
228 <span data-ng-if="action.option.name === 'commission'">Commission {$ type_name $}</span>
229 <span data-ng-if="action.option.name === 'test'">Test {$ type_name $}</span>
230@@ -146,7 +146,7 @@
231 Node failed to be {$ action.option.sentence $}, because of the following error: {$ action.error $}
232 </p>
233 <div class="page-header__controls">
234- <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
235+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel()">Cancel</button>
236 <button class="button--secondary button--inline" data-ng-click="actionGo()">Retry</button>
237 </div>
238 </div>
239@@ -157,7 +157,7 @@
240 Node cannot be {$ action.option.sentence $}, because the required boot images have not been imported. To import boot images, visit the <a href="images/">images page</a>.
241 </p>
242 <div class="page-header__controls">
243- <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
244+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel()">Cancel</button>
245 </div>
246 </div>
247
248@@ -168,7 +168,7 @@
249 {$ getPowerErrors() $} on the rack controller.
250 </p>
251 <div class="page-header__controls">
252- <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
253+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel()">Cancel</button>
254 </div>
255 </div>
256
257@@ -177,7 +177,7 @@
258 Node cannot be {$ action.option.sentence $}, because an SSH key has not been added to your account. To add an SSH key, visit <a href="account/prefs/">your account page</a>.
259 </p>
260 <div class="page-header__controls">
261- <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
262+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel()">Cancel</button>
263 </div>
264 </div>
265 </div>
266@@ -443,7 +443,7 @@
267 </div>
268 </fieldset>
269 <div class="twelve-col u-align--right" data-ng-if="summary.editing">
270- <button class="button--base button--inline"
271+ <button class="button--base button--inline" type="button"
272 data-ng-click="cancelEditSummary()">Cancel</button>
273 <button class="button--positive button--inline"
274 data-ng-class="{ secondary: invalidArchitecture() }"
275@@ -508,7 +508,7 @@
276 data-ng-model="power">
277 </fieldset>
278 <div class="twelve-col u-align--right ng-hide" data-ng-show="power.editing">
279- <button class="button--base button--inline"
280+ <button class="button--base button--inline" type="button"
281 data-ng-click="cancelEditPower()">Cancel</button>
282 <button class="button--positive button--inline"
283 data-ng-class="{ secondary: invalidPowerType() }"
284@@ -970,7 +970,7 @@
285 <maas-obj-errors></maas-obj-errors>
286 </div>
287 <div class="table__data u-float--right">
288- <button class="button--base button--inline"
289+ <button class="button--base button--inline" type="button"
290 data-ng-click="editCancel()">Cancel</button>
291 <button class="button--positive button--inline"
292 data-ng-disabled="(!isDevice && isInterfaceNameInvalid(editInterface)) || isIPAddressInvalid(editInterface) || isMACAddressInvalid(editInterface.mac_address, true)"
293@@ -984,7 +984,7 @@
294 <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to remove this {$ getRemoveTypeText(interface) $}?</p>
295 </div>
296 <div class="table__data u-float--right">
297- <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
298+ <button class="button--base button--inline" type="button" data-ng-click="cancel()">Cancel</button>
299 <button class="button--destructive button--inline" data-ng-click="confirmRemove(interface)">Remove</button>
300 </div>
301 </div>
302@@ -998,7 +998,7 @@
303 data-ng-show="canAddAnotherVLAN(interface)">Add <span data-ng-show="newInterface.type === 'vlan'">another </span>VLAN</button>
304 </div>
305 <div class="table__data u-float--right">
306- <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
307+ <button class="button--base button--inline" type="button" data-ng-click="cancel()">Cancel</button>
308 <button class="button--positive button--inline" data-ng-click="addInterface()">Add</button>
309 </div>
310 </div>
311@@ -1098,7 +1098,7 @@
312 </div>
313 <div class="table__row is-active">
314 <div class="table__data u-float--right">
315- <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
316+ <button class="button--base button--inline" type="button" data-ng-click="cancel()">Cancel</button>
317 <button class="button--positive button--inline"
318 data-ng-click="addBond()"
319 data-ng-disabled="cannotAddBond()">Save</button>
320@@ -1182,7 +1182,7 @@
321 </div>
322 <div class="table__row is-active">
323 <div class="table__data u-float--right">
324- <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
325+ <button class="button--base button--inline" type="button" data-ng-click="cancel()">Cancel</button>
326 <button class="button--positive button--inline"
327 data-ng-click="addBridge()"
328 data-ng-disabled="cannotAddBridge()">Save</button>
329@@ -1334,7 +1334,7 @@
330 <span class="icon icon--error u-margin--right-small"></span>{$ newInterface.errorMsg $}
331 </div>
332 <div class="table__data u-float--right">
333- <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
334+ <button class="button--base button--inline" type="button" data-ng-click="cancel()">Cancel</button>
335 <button class="button--positive button--inline"
336 data-ng-click="addPhysicalInterface()"
337 data-ng-disabled="cannotAddPhysicalInterface()">Save</button>
338@@ -1438,7 +1438,7 @@
339 <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to unmount this filesystem?</p>
340 </div>
341 <div class="table__data u-float--right">
342- <button class="button--base button--inline" data-ng-click="filesystemCancel()">Cancel</button>
343+ <button class="button--base button--inline" type="button" data-ng-click="filesystemCancel()">Cancel</button>
344 <button class="button--secondary button--inline" data-ng-click="filesystemConfirmUnmount(filesystem)">Unmount</button>
345 </div>
346 </div>
347@@ -1447,7 +1447,7 @@
348 <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to remove this {$ getRemoveTypeText(filesystem) $}?</p>
349 </div>
350 <div class="table__data u-float--right">
351- <button class="button--base button--inline" data-ng-click="filesystemCancel(filesystem)">Cancel</button>
352+ <button class="button--base button--inline" type="button" data-ng-click="filesystemCancel(filesystem)">Cancel</button>
353 <button class="button--destructive button--inline" data-ng-click="filesystemConfirmDelete(filesystem)">Remove</button>
354 </div>
355 </div>
356@@ -1497,7 +1497,7 @@
357 </div>
358 <div class="table__row is-active">
359 <div class="table__data u-float--right">
360- <button class="button--base button--inline"
361+ <button class="button--base button--inline" type="button"
362 data-ng-click="cancel()">Cancel</button>
363 <button class="button--secondary button--inline ng-binding"
364 data-ng-disabled="!canMount()"
365@@ -1567,7 +1567,7 @@
366 <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to delete this cache set?</p>
367 </div>
368 <div class="table__data u-float--right">
369- <button class="button--base button--inline" data-ng-click="cacheSetCancel()">Cancel</button>
370+ <button class="button--base button--inline" type="button" data-ng-click="cacheSetCancel()">Cancel</button>
371 <button class="button--destructive button--inline" data-ng-click="cacheSetConfirmDelete(cacheset)">Remove</button>
372 </div>
373 </div>
374@@ -1943,7 +1943,7 @@
375 data-ng-class="{ 'is-active': availableMode !== null && activeMode !== 'multi' }">
376 <div data-ng-if="availableMode === 'edit'">
377 <div class="table__data u-float--right">
378- <button class="button--base button--inline" data-ng-click="availableCancel(item)">Cancel</button>
379+ <button class="button--base button--inline" type="button" data-ng-click="availableCancel(item)">Cancel</button>
380 <button class="button--positive button--inline"
381 data-ng-disabled="isMountPointInvalid(item.$options.mountPoint) || isNameInvalid(item)"
382 data-ng-click="availableConfirmEdit(item)">Save</button>
383@@ -1954,13 +1954,13 @@
384 <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to remove this {$ getRemoveTypeText(item) $}?</p>
385 </div>
386 <div class="table__data u-float--right">
387- <button class="button--base button--inline" data-ng-click="availableCancel(item)">Cancel</button>
388+ <button class="button--base button--inline" type="button" data-ng-click="availableCancel(item)">Cancel</button>
389 <button class="button--destructive button--inline" data-ng-click="availableConfirmDelete(item)">Remove</button>
390 </div>
391 </div>
392 <div data-ng-if="availableMode === 'partition'">
393 <div class="table__data u-float--right">
394- <button class="button--base button--inline" data-ng-click="availableCancel(item)">Cancel</button>
395+ <button class="button--base button--inline" type="button" data-ng-click="availableCancel(item)">Cancel</button>
396 <button class="button--positive button--inline"
397 data-ng-disabled="isAddPartitionSizeInvalid(item) || isMountPointInvalid(item.$options.mountPoint)"
398 data-ng-click="availableConfirmPartition(item)">Add partition</button>
399@@ -1968,7 +1968,7 @@
400 </div>
401 <div data-ng-if="availableMode === 'logical-volume'">
402 <div class="table__data u-float--right">
403- <button class="button--base button--inline" data-ng-click="availableCancel(item)">Cancel</button>
404+ <button class="button--base button--inline" type="button" data-ng-click="availableCancel(item)">Cancel</button>
405 <button class="button--positive button--inline"
406 data-ng-disabled="isLogicalVolumeNameInvalid(item) || isAddLogicalVolumeSizeInvalid(item) || isMountPointInvalid(item.$options.mountPoint)"
407 data-ng-click="availableConfirmLogicalVolume(item)">Add logical volume</button>
408@@ -2080,7 +2080,7 @@
409 </div>
410 <div class="table__row is-active">
411 <div class="table__data u-float--right">
412- <button class="button--base button--inline"
413+ <button class="button--base button--inline" type="button"
414 data-ng-click="availableCancel()">Cancel</button>
415 <button class="button--positive button--inline"
416 data-ng-disabled="!createBcacheCanSave()"
417@@ -2197,7 +2197,7 @@
418 </div>
419 <div class="table__row is-active">
420 <div class="table__data u-float--right">
421- <button class="button--base button--inline"
422+ <button class="button--base button--inline" type="button"
423 data-ng-click="availableCancel()">Cancel</button>
424 <button class="button--positive button--inline"
425 data-ng-disabled="!createRAIDCanSave()"
426@@ -2259,7 +2259,7 @@
427 </div>
428 <div class="table__row is-active">
429 <div class="table__data u-float--right">
430- <button class="button--base button--inline"
431+ <button class="button--base button--inline" type="button"
432 data-ng-click="availableCancel()">Cancel</button>
433 <button class="button--positive button--inline"
434 data-ng-disabled="!createVolumeGroupCanSave()"
435diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
436index a817cf3..004d153 100644
437--- a/src/maasserver/static/partials/nodes-list.html
438+++ b/src/maasserver/static/partials/nodes-list.html
439@@ -121,7 +121,7 @@
440 </fieldset>
441 </form>
442 <div class="page-header__controls" data-ng-if="tabs[tab].actionOption.name !== 'commission' && tabs[tab].actionOption.name !== 'test'">
443- <button class="button--base button--inline" data-ng-click="actionCancel(tab)">Cancel</button>
444+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel(tab)">Cancel</button>
445 <button class="button--inline" data-ng-class="tabs[tab].actionOption.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="actionGo(tab)" data-ng-hide="hasActionsFailed(tab)">
446 <span data-ng-if="tabs[tab].actionOption.name === 'acquire'">Acquire {$ tabs[tab].selectedItems.length $}
447 <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
448@@ -194,7 +194,7 @@
449 </section>
450 <section class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="isActionError(tab) || hasActionsInProgress(tab)" data-ng-if="tabs[tab].actionOption.name === 'commission' || tabs[tab].actionOption.name === 'test'">
451 <div class="page-header__controls">
452- <button class="button--base button--inline" data-ng-click="actionCancel(tab)">Cancel</button>
453+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel(tab)">Cancel</button>
454 <button class="button--inline" data-ng-class="tabs[tab].actionOption.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="actionGo(tab)" data-ng-hide="hasActionsFailed(tab)">
455 <span data-ng-if="tabs[tab].actionOption.name === 'commission'">Commission {$ tabs[tab].selectedItems.length $}
456 <span data-ng-pluralize count="tabs[tab].selectedItems.length" when="{'one': 'machine', 'other': 'machines'}"></span>
457@@ -347,7 +347,7 @@
458 <section class="page-header__section twelve-col u-margin--bottom-none" data-ng-show="showMachine()">
459 <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
460 <div class="page-header__controls">
461- <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
462+ <button class="button--base button--inline" type="button" data-ng-click="cancel()">Cancel</button>
463 <button class="button--secondary button--inline"
464 data-ng-disabled="machineHasError()"
465 data-ng-click="saveMachine(true)">Save and add another</button>
466@@ -361,7 +361,7 @@
467 <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="showChassis()">
468 <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
469 <div class="page-header__controls">
470- <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
471+ <button class="button--base button--inline" type="button" data-ng-click="cancel()">Cancel</button>
472 <button class="button--secondary button--inline"
473 data-ng-disabled="chassisHasErrors()"
474 data-ng-click="saveChassis(true)">Save and add another</button>
475@@ -521,7 +521,7 @@
476 <form class="form form--inline">
477 <p class="page-header__message page-header__message--error ng-hide" data-ng-show="error">{$ error $}</p>
478 <div class="page-header__controls">
479- <button class="button--base button--inline" data-ng-click="cancel()">Cancel</button>
480+ <button class="button--base button--inline" type="button" data-ng-click="cancel()">Cancel</button>
481 <button class="button--secondary button--inline"
482 data-ng-class="{ disabled: deviceHasError() }"
483 data-ng-click="save(true)">Save and add another</button>
484@@ -560,7 +560,7 @@
485 </fieldset>
486 </form>
487 <div class="page-header__controls" data-ng-if="tabs.controllers.actionOption.name !== 'test'">
488- <button class="button--base button--inline" data-ng-click="actionCancel('controllers')">Cancel</button>
489+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel('controllers')">Cancel</button>
490 <button class="button--positive button--inline" data-ng-click="actionGo('controllers')">
491 <span data-ng-if="tabs.controllers.actionOption.name === 'set-zone'">Set zone for {$ tabs.controllers.selectedItems.length $}
492 <span data-ng-pluralize count="tabs.controllers.selectedItems.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
493@@ -592,7 +592,7 @@
494 </div>
495 <div class="page-header__section twelve-col u-margin--bottom-none" data-ng-hide="isActionError('controllers') || hasActionsInProgress('controllers')" data-ng-if="tabs.controllers.actionOption.name === 'test'">
496 <div class="page-header__controls">
497- <button class="button--base button--inline" data-ng-click="actionCancel('controllers')">Cancel</button>
498+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel('controllers')">Cancel</button>
499 <button class="button--positive button--inline" data-ng-click="actionGo('controllers')">
500 <span>Test {$ tabs.controllers.selectedItems.length $}
501 <span data-ng-pluralize count="tabs.controllers.selectedItems.length" when="{'one': 'controller', 'other': 'controllers'}"></span>
502diff --git a/src/maasserver/static/partials/pod-details.html b/src/maasserver/static/partials/pod-details.html
503index 52c7695..9db98e8 100644
504--- a/src/maasserver/static/partials/pod-details.html
505+++ b/src/maasserver/static/partials/pod-details.html
506@@ -91,7 +91,7 @@
507 <p class="page-header__message page-header__message--error" maas-obj-hide-saving><maas-obj-errors></maas-obj-errors></p>
508 <p class="page-header__message" maas-obj-show-saving><maas-obj-saving>Composing machine</maas-obj-saving></p>
509 <div class="page-header__controls" maas-obj-hide-saving>
510- <button class="button--base button--inline" data-ng-click="cancelCompose()">Cancel</button>
511+ <button class="button--base button--inline" type="button" data-ng-click="cancelCompose()">Cancel</button>
512 <button class="button--positive button--inline" maas-obj-save>Compose machine</button>
513 </div>
514 </section>
515@@ -110,7 +110,7 @@
516 Performing {$ action.option.sentence $} failed: {$ action.error $}
517 </p>
518 <div class="page-header__controls">
519- <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
520+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel()">Cancel</button>
521 <button class="button--inline" data-ng-class="actionOption.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="actionGo()" data-ng-if="!action.error">
522 <span data-ng-if="action.option.name === 'refresh'">Refresh pod</span>
523 <span data-ng-if="action.option.name === 'delete'">Delete pod</span>
524diff --git a/src/maasserver/static/partials/pods-list.html b/src/maasserver/static/partials/pods-list.html
525index cd0fb69..2a0fac3 100644
526--- a/src/maasserver/static/partials/pods-list.html
527+++ b/src/maasserver/static/partials/pods-list.html
528@@ -27,7 +27,7 @@
529 see listing for specific error for each pod.
530 </p>
531 <div class="page-header__controls">
532- <button class="button--base button--inline" data-ng-click="actionCancel()">Cancel</button>
533+ <button class="button--base button--inline" type="button" data-ng-click="actionCancel()">Cancel</button>
534 <button class="button--inline" data-ng-class="action.option.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="actionGo()" data-ng-if="!hasActionsFailed()">
535 <span data-ng-if="action.option.name === 'refresh'">Refresh {$ selectedItems.length $}
536 <span data-ng-pluralize count="selectedItems.length" when="{'one': 'pod', 'other': 'pods'}"></span>
537@@ -63,7 +63,7 @@
538 <p class="page-header__message page-header__message--error" maas-obj-hide-saving><maas-obj-errors></maas-obj-errors></p>
539 <p class="page-header__message" maas-obj-show-saving><maas-obj-saving>Trying to connect and discover pod</maas-obj-saving></p>
540 <div class="page-header__controls" maas-obj-hide-saving>
541- <button class="button--base button--inline" data-ng-click="cancelAddPod()">Cancel</button>
542+ <button class="button--base button--inline" type="button" data-ng-click="cancelAddPod()">Cancel</button>
543 <button class="button--positive button--inline" maas-obj-save>Save pod</button>
544 </div>
545 </section>
546diff --git a/src/maasserver/static/partials/settings.html b/src/maasserver/static/partials/settings.html
547index b6bff07..3ebfab4 100644
548--- a/src/maasserver/static/partials/settings.html
549+++ b/src/maasserver/static/partials/settings.html
550@@ -142,7 +142,7 @@
551 <maas-obj-errors></maas-obj-errors>
552 </div>
553 <div class="table__data u-float--right">
554- <button class="button--base button--inline"
555+ <button class="button--base button--inline" type="button"
556 data-ng-click="snippetExitEdit(snippet)">Cancel</button>
557 <button class="button--positive button--inline" maas-obj-save>Save snippet</button>
558 </div>
559@@ -159,7 +159,7 @@
560 <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to remove this snippet?</p>
561 </div>
562 <div class="table__data u-float--right">
563- <button class="button--base button--inline" data-ng-click="snippetExitRemove(snippet)">Cancel</button>
564+ <button class="button--base button--inline" type="button" data-ng-click="snippetExitRemove(snippet)">Cancel</button>
565 <button class="button--destructive button--inline" data-ng-click="snippetConfirmRemove(snippet)">Remove</button>
566 </div>
567 </div>
568@@ -258,7 +258,7 @@
569 <maas-obj-errors></maas-obj-errors>
570 </div>
571 <div class="table__data u-float--right">
572- <button class="button--base button--inline"
573+ <button class="button--base button--inline" type="button"
574 data-ng-click="snippetAddCancel()">Cancel</button>
575 <button class="button--positive button--inline" maas-obj-save>Save snippet</button>
576 </div>
577@@ -491,7 +491,7 @@
578 <maas-obj-errors></maas-obj-errors>
579 </div>
580 <div class="table__data u-float--right">
581- <button class="button--base button--inline"
582+ <button class="button--base button--inline" type="button"
583 data-ng-click="repositoryExitEdit()">Cancel</button>
584 <button class="button--positive button--inline" maas-obj-save>Save repository</button>
585 </div>
586@@ -509,7 +509,7 @@
587 <p><span class="icon icon--warning u-margin--right-small"></span> Are you sure you want to remove this repository?</p>
588 </div>
589 <div class="table__data u-float--right">
590- <button class="button--base button--inline" data-ng-click="repositoryExitRemove()">Cancel</button>
591+ <button class="button--base button--inline" type="button" data-ng-click="repositoryExitRemove()">Cancel</button>
592 <button class="button--destructive button--inline" data-ng-click="repositoryConfirmRemove()">Remove</button>
593 </div>
594 </div>
595@@ -571,7 +571,7 @@
596 <maas-obj-errors></maas-obj-errors>
597 </div>
598 <div class="table__data u-float--right">
599- <button class="button--base button--inline"
600+ <button class="button--base button--inline" type="button"
601 data-ng-click="repositoryAddCancel()">Cancel</button>
602 <button class="button--positive button--inline" maas-obj-save>Add repository</button>
603 </div>
604diff --git a/src/maasserver/static/partials/space-details.html b/src/maasserver/static/partials/space-details.html
605index 856dd01..a98aa4b 100644
606--- a/src/maasserver/static/partials/space-details.html
607+++ b/src/maasserver/static/partials/space-details.html
608@@ -20,7 +20,7 @@
609 Space cannot be deleted because it has subnets attached. Remove all subnets from the space to allow deletion.
610 </p>
611 <div class="page-header__controls">
612- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
613+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
614 </div>
615 </div>
616 <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="canBeDeleted() && !error">
617@@ -28,14 +28,14 @@
618 Are you sure you want to delete this space?
619 </p>
620 <div class="page-header__controls">
621- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
622+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
623 <button class="button--destructive button--inline" data-ng-click="deleteConfirmButton()">Delete space</button>
624 </div>
625 </div>
626 <div class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="canBeDeleted() && error">
627 <p class="page-header__message page-header__message--error">{$ error $}</p>
628 <div class="page-header__controls">
629- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
630+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
631 <button class="button--secondary button--inline" data-ng-click="deleteConfirmButton()">Retry</button>
632 </div>
633 </div>
634@@ -64,7 +64,7 @@
635 label-width="two" input-width="three" blur-on-enter="true"></maas-obj-field>
636 </fieldset>
637 <div class="twelve-col u-align--right">
638- <button class="button--base button--inline"
639+ <button class="button--base button--inline" type="button"
640 data-ng-click="exitEditSummary()">Cancel</button>
641 <button class="button--positive button--inline" maas-obj-save>Save summary</button>
642 </div>
643diff --git a/src/maasserver/static/partials/ssh-keys.html b/src/maasserver/static/partials/ssh-keys.html
644index 771a1cd..e5e12a1 100644
645--- a/src/maasserver/static/partials/ssh-keys.html
646+++ b/src/maasserver/static/partials/ssh-keys.html
647@@ -45,7 +45,7 @@
648 <p><span class="icon icon--warning u-margin--right-small"></span>Are you sure you want to remove this key?</p>
649 </div>
650 <div class="table__data u-float--right">
651- <button class="button--base button--inline" data-ng-click="close()">Cancel</button>
652+ <button class="button--base button--inline" type="button" data-ng-click="close()">Cancel</button>
653 <button class="button--destructive button--inline" data-ng-click="confirmDelete(group)">Remove</button>
654 </div>
655 </div>
656diff --git a/src/maasserver/static/partials/subnet-details.html b/src/maasserver/static/partials/subnet-details.html
657index 75eaae0..772b9be 100755
658--- a/src/maasserver/static/partials/subnet-details.html
659+++ b/src/maasserver/static/partials/subnet-details.html
660@@ -23,7 +23,7 @@
661 You will start mapping your subnet. Go to the <a href="#/dashboard">dashboard</a> to see the discovered items.
662 </p>
663 <div class="page-header__controls">
664- <button class="button--base button--inline" data-ng-click="cancelAction()">Cancel</button>
665+ <button class="button--base button--inline" type="button" data-ng-click="cancelAction()">Cancel</button>
666 <button class="button--positive button--inline" data-ng-click="actionGo()">Map subnet</button>
667 </div>
668 </section>
669@@ -32,14 +32,14 @@
670 Are you sure you want to delete this subnet and release all IP addresses assigned within its range?
671 </p>
672 <div class="page-header__controls">
673- <button class="button--base button--inline" data-ng-click="cancelAction()">Cancel</button>
674+ <button class="button--base button--inline" type="button" data-ng-click="cancelAction()">Cancel</button>
675 <button class="button--destructive button--inline" data-ng-click="actionGo()">Delete subnet</button>
676 </div>
677 </section>
678 <section class="page-header__section twelve-col u-margin--bottom-none ng-hide" data-ng-show="actionError">
679 <p class="page-header__message page-header__message--error">{$ actionError $}</p>
680 <div class="page-header__controls">
681- <button class="button--base button--inline" data-ng-click="cancelAction()">Cancel</button>
682+ <button class="button--base button--inline" type="button" data-ng-click="cancelAction()">Cancel</button>
683 <button class="button--secondary button--inline" data-ng-click="actionRetry()">Retry</button>
684 </div>
685 </section>
686@@ -161,7 +161,7 @@
687 <maas-obj-errors></maas-obj-errors>
688 </div>
689 <div class="six-col last-col u-align--right">
690- <button class="button--base button--inline"
691+ <button class="button--base button--inline" type="button"
692 data-ng-click="exitEditSummary()">Cancel</button>
693 <button class="button--positive button--inline" maas-obj-save>Save summary</button>
694 </div>
695@@ -218,7 +218,7 @@
696 <p><span class="icon icon--warning u-margin--right-small"></span>Are you sure you want to remove this static route?</p>
697 </div>
698 <div class="table__data u-float--right">
699- <button class="button--base button--inline" data-ng-click="staticRouteCancelDelete()">Cancel</button>
700+ <button class="button--base button--inline" type="button" data-ng-click="staticRouteCancelDelete()">Cancel</button>
701 <button class="button--destructive button--inline" data-ng-click="staticRouteConfirmDelete()">Remove</button>
702 </div>
703 </div>
704@@ -250,7 +250,7 @@
705 <maas-obj-errors></maas-obj-errors>
706 </div>
707 <div class="table__data u-float--right">
708- <button class="button--base button--inline" data-ng-click="staticRouteToggleEditMode(staticRoute)">Cancel</button>
709+ <button class="button--base button--inline" type="button" data-ng-click="staticRouteToggleEditMode(staticRoute)">Cancel</button>
710 <button class="button--positive button--inline" maas-obj-save>Save static route</button>
711 </div>
712 </div>
713@@ -297,7 +297,7 @@
714 <maas-obj-errors></maas-obj-errors>
715 </div>
716 <div class="table__data u-float--right">
717- <button class="button--base button--inline" data-ng-click="cancelAddStaticRoute()">Cancel</button>
718+ <button class="button--base button--inline" type="button" data-ng-click="cancelAddStaticRoute()">Cancel</button>
719 <button class="button--positive button--inline" maas-obj-save>Save static route</button>
720 </div>
721 </div>
722diff --git a/src/maasserver/static/partials/vlan-details.html b/src/maasserver/static/partials/vlan-details.html
723index a526ed9..1c70452 100644
724--- a/src/maasserver/static/partials/vlan-details.html
725+++ b/src/maasserver/static/partials/vlan-details.html
726@@ -203,7 +203,7 @@
727 Are you sure you want to delete this VLAN?
728 </p>
729 <div class="page-header__controls">
730- <button class="button--base button--inline" data-ng-click="vlanDetails.actionCancel()">Cancel</button>
731+ <button class="button--base button--inline" type="button" data-ng-click="vlanDetails.actionCancel()">Cancel</button>
732 <button class="button--inline" data-ng-class="vlanDetails.actionOption.name === 'delete' ? 'button--destructive' : 'button--positive'" data-ng-click="vlanDetails.actionGo()" data-ng-disabled="!vlanDetails.canPerformAction()">{$ vlanDetails.actionOption.title $}</button>
733 </div>
734 </section>
735@@ -211,7 +211,7 @@
736 data-ng-if="vlanDetails.isActionError()">
737 <p class="page-header__message page-header__message--error">{$ vlanDetails.actionError $}</p>
738 <div class="page-header__controls">
739- <button class="button--base button--inline u-margin--right" data-ng-click="vlanDetails.actionCancel()">Cancel</button>
740+ <button class="button--base button--inline u-margin--right" type="button" data-ng-click="vlanDetails.actionCancel()">Cancel</button>
741 <button class="button--secondary button--inline" data-ng-click="vlanDetails.actionRetry()">Retry</button>
742 </div>
743 </section>
744@@ -285,7 +285,7 @@
745 </dl>
746 </div>
747 <div class="twelve-col u-align--right">
748- <button class="button--base button--inline"
749+ <button class="button--base button--inline" type="button"
750 data-ng-click="vlanDetails.exitEditSummary()">Cancel</button>
751 <button class="button--positive button--inline" maas-obj-save>Save summary</button>
752 </div>
753diff --git a/src/maasserver/static/partials/zone-details.html b/src/maasserver/static/partials/zone-details.html
754index dec2f3b..c4e97d0 100644
755--- a/src/maasserver/static/partials/zone-details.html
756+++ b/src/maasserver/static/partials/zone-details.html
757@@ -20,7 +20,7 @@
758 Zone cannot be deleted because it is the default zone.
759 </p>
760 <div class="page-header__controls">
761- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
762+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
763 </div>
764 </section>
765 <section class="page-header__section ng-hide" data-ng-show="canBeDeleted() && !error">
766@@ -28,14 +28,14 @@
767 Are you sure you want to delete this zone?
768 </p>
769 <div class="page-header__controls">
770- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
771+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
772 <button class="button--destructive button--inline" data-ng-click="deleteConfirmButton()">Delete zone</button>
773 </div>
774 </section>
775 <section class="page-header__section ng-hide" data-ng-show="canBeDeleted() && error">
776 <p class="page-header__message page-header__message--error">{$ error $}</p>
777 <div class="page-header__controls">
778- <button class="button--base button--inline" data-ng-click="cancelDeleteButton()">Cancel</button>
779+ <button class="button--base button--inline" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
780 <button class="button--secondary button--inline" data-ng-click="deleteConfirmButton()">Retry</button>
781 </div>
782 </section>
783@@ -73,7 +73,7 @@
784 </dl>
785 </fieldset>
786 <div class="twelve-col u-align--right">
787- <button class="button--base button--inline"
788+ <button class="button--base button--inline" type="button"
789 data-ng-click="exitEditSummary()">Cancel</button>
790 <button class="button--positive button--inline" maas-obj-save>Save summary</button>
791 </div>
792diff --git a/src/maasserver/static/partials/zones-list.html b/src/maasserver/static/partials/zones-list.html
793index 81edc3f..5aa8ea3 100755
794--- a/src/maasserver/static/partials/zones-list.html
795+++ b/src/maasserver/static/partials/zones-list.html
796@@ -21,7 +21,7 @@
797 placeholder="Name (required)"></maas-obj-field>
798 </fieldset>
799 <div class="page-header__controls">
800- <button class="button--base button--inline" data-ng-click="closeZone()">Cancel</button>
801+ <button class="button--base button--inline" type="button" data-ng-click="closeZone()">Cancel</button>
802 <button class="button--positive button--inline" maas-obj-save>Add zone</button>
803 </div>
804 </maas-obj-form>

Subscribers

People subscribed via source and target branches