forcedialog: integrate children of nested fields

The current implementation gather the fields of ui elements that are of type nested (NestedParameter). However, some UI elements might inherit from NestedParameter, but still have another type. This commit permits to handle such, but ducktyping nested ui fields, on the presence of the attribute fields.
buildbot · May 21, 2015 · f3ea668 · f3ea668
1 parent a63dc6c
commit f3ea668
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/www/base/src/app/builders/buildrequest/forcedialog/forcedialog.controller.coffee b/www/base/src/app/builders/buildrequest/forcedialog/forcedialog.controller.coffee
@@ -3,7 +3,7 @@ class forceDialog extends Controller
         # prepare default values
         prepareFields = (fields) ->
             for field in fields
-                if field.type == 'nested'
+                if field.fields?
                     prepareFields(field.fields)
                 else
                     field.value = field.default
@@ -22,7 +22,7 @@ class forceDialog extends Controller
                 gatherFields = (fields) ->
                     for field in fields
                         field.errors = ''
-                        if field.type == 'nested'
+                        if field.fields?
                             gatherFields(field.fields)
                         else
                             params[field.fullName] = field.value
@@ -39,4 +39,4 @@ class forceDialog extends Controller
                     $rootScope.$apply()
 
             cancel: ->
-                modal.modal.dismiss()
+                modal.modal.dismiss()