Merge pull request #27 from skitternd/device-brand-support

Pass DeviceBrand .ks header to mic via tokenmap

Author: keto

src/img_web/app/forms.py

@@ -261,6 +261,11 @@ class ImageJobForm(forms.Form):
         required=False,
         widget=forms.HiddenInput(attrs={'readonly': 'readonly'}),
     )
+    brand = forms.CharField(
+        label="Brand",
+        required=False,
+        widget=forms.HiddenInput(attrs={'readonly': 'readonly'}),
+    )
 
     def __init__(self, *args, **kwargs):
         super(ImageJobForm, self).__init__(*args, **kwargs)
@@ -269,7 +274,7 @@ def __init__(self, *args, **kwargs):
             r'^#.*?Suggested(Architecture|ImageType|Features):(.*)$'
         )
         device_re = re.compile(
-            r'^#.*?(DeviceModel|DeviceVariant):(.*)$'
+            r'^#.*?(DeviceModel|DeviceVariant|Brand):(.*)$'
         )
         for template in glob.glob(os.path.join(settings.TEMPLATESDIR, '*.ks')):
             name = os.path.basename(template)

src/img_web/app/views.py

@@ -153,6 +153,9 @@ def submit(request):
         devicevarianttoken = jobdata.get('devicevariant')
         if devicevarianttoken:
             tokenmap['DEVICEVARIANT'] = devicevarianttoken
+        brandtoken = jobdata.get('brand')
+        if brandtoken:
+            tokenmap['BRAND'] = brandtoken
 
         tokens_list = []
         extra_repos_tmp = []

src/img_web/templates/app/upload.html

@@ -112,7 +112,7 @@
             </td>
         </tr>
         </table>
-        {{ jobform.devicemodel }} {{ jobform.devicevariant }}
+        {{ jobform.devicemodel }} {{ jobform.devicevariant }} {{ jobform.brand }}
     </fieldset>
 </table>
 <fieldset>