Ticket #87: html.py.diff

html.py

@@ -570 +596 @@
     def make_user_defined_rows(self):
         userDefRows = name = type = label = value = ""
         customBuildProperties = self.status.getCustomBuildProperties()   
-        for properties in customBuildProperties:
-            name = properties['propertyName']
-            type = properties['propertyType']
-            label = properties['propertyLabel']               
-            if type == 'radio':               
-                value = properties['groupValue']
-                field = "<input type=" + "\'" + type + "\'" + "name=" + "\'" + \
-                                name + "\'" + "value=" + "\'" + value + "\'" + " />"
-            else:
-                field = "<input type=" + "\'" + type + "\'" +  \
-                                "name=" + "\'" + name + "\'" + " />"
+        if None != customBuildProperties:
+            for properties in customBuildProperties:
+                name = properties['propertyName']
+                type = properties['propertyType']
+                label = properties['propertyLabel']               
+                if type == 'radio':               
+                    value = properties['groupValue']
+                    field = "<input type=" + "\'" + type + "\'" + "name=" + "\'" + \
+                        name + "\'" + "value=" + "\'" + value + "\'" + " />"
+                else:
+                    field = "<input type=" + "\'" + type + "\'" +  \
+                        "name=" + "\'" + name + "\'" + " />"
 
-            userDefRows += make_row(label, field)
-            name = type = label = value = ""
+                    userDefRows += make_row(label, field)
+                    name = type = label = value = ""
 
         return userDefRows
 
@@ -596 +623 @@
         # Custom properties.
         custom_props = {}          
         forceBuildProperties = self.status.getCustomBuildProperties()   
-        for dict in forceBuildProperties:
-            for key, value in dict.iteritems():             
-               if key == 'propertyName':
-                   custom_props[value] = request.args.get(value, [""])[0]
+        if None != forceBuildProperties:
+            for dict in forceBuildProperties:
+                for key, value in dict.iteritems():             
+                    if key == 'propertyName':
+                        custom_props[value] = request.args.get(value, [""])[0]
 
         r = "The web-page 'force build' button was pressed by '%s': %s\n" \
             % (name, reason)