Merge ~ya-bo-ng/maas:fix-ssl-cancel into maas:master

Proposed by Anthony Dillon
Status: Merged
Approved by: Andres Rodriguez
Approved revision: dca3dda4bc8498893095174debcc0a6159bdaf73
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ya-bo-ng/maas:fix-ssl-cancel
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/maasserver/templates/maasserver/prefs_add_sslkey.html (+1/-1)
Reviewer Review Type Date Requested Status
Newell Jensen (community) Approve
MAAS Lander unittests Pending
Review via email: mp+341861@code.launchpad.net

Commit message

Fix the cancel when adding a SSL key

Description of the change

Simply changed the cancel from a button to a link which does not submit the form.

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/templates/maasserver/prefs_add_sslkey.html b/src/maasserver/templates/maasserver/prefs_add_sslkey.html
index fd754e4..d50dd76 100644
--- a/src/maasserver/templates/maasserver/prefs_add_sslkey.html
+++ b/src/maasserver/templates/maasserver/prefs_add_sslkey.html
@@ -15,7 +15,7 @@
15 {% endfor %}15 {% endfor %}
16 </ul>16 </ul>
17 <div class="p-form__group u-float--right">17 <div class="p-form__group u-float--right">
18 <button class="p-button--base" href="{% url 'prefs' %}">Cancel</button>18 <a class="p-button--base" href="{% url 'prefs' %}">Cancel</a>
19 <button type="submit" class="p-button--positive">Add key</button>19 <button type="submit" class="p-button--positive">Add key</button>
20 </div>20 </div>
21 </form>21 </form>

Subscribers

People subscribed via source and target branches