launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/typo into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/typo/+merge/101221

This fixes two small things:

1. A typo “commissionning” spotted by Jamie.

2. That horrible, horrible “After commissioning action” label on the Node edit form that Django generated for us.  It now just reads “After commissioning” instead, as designed.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/typo/+merge/101221
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/typo into lp:maas.

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2012-04-05 07:34:05 +0000
+++ src/maasserver/forms.py	2012-04-09 04:58:19 +0000
@@ -84,6 +84,7 @@
         widget=forms.TextInput(attrs={'readonly': 'readonly'}),
         required=False)
     after_commissioning_action = forms.TypedChoiceField(
+        label="After commissioning",
         choices=NODE_AFTER_COMMISSIONING_ACTION_CHOICES, required=False,
         empty_value=NODE_AFTER_COMMISSIONING_ACTION.DEFAULT)
     architecture = forms.ChoiceField(
@@ -100,6 +101,7 @@
 
 class UINodeEditForm(ModelForm):
     after_commissioning_action = forms.ChoiceField(
+        label="After commissioning",
         choices=NODE_AFTER_COMMISSIONING_ACTION_CHOICES)
 
     class Meta:
@@ -109,6 +111,7 @@
 
 class UIAdminNodeEditForm(ModelForm):
     after_commissioning_action = forms.ChoiceField(
+        label="After commissioning",
         choices=NODE_AFTER_COMMISSIONING_ACTION_CHOICES)
 
     class Meta:

=== modified file 'src/maasserver/templates/maasserver/snippets.html'
--- src/maasserver/templates/maasserver/snippets.html	2012-03-14 10:49:59 +0000
+++ src/maasserver/templates/maasserver/snippets.html	2012-04-09 04:58:19 +0000
@@ -22,7 +22,7 @@
     </div>
   </p>
   <p>
-    <label for="id_after_commissioning_action">After commissionning</label>
+    <label for="id_after_commissioning_action">After commissioning</label>
     {{ node_form.after_commissioning_action }}
   </p>
 </script>