From 6a6797bf533de06108433c2fb4cd5dd2400c5fa4 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed, 3 Dec 2014 15:51:42 -0800
Subject: [PATCH] [Forms] Handle required flag in composite controls

Handle the ng-required flag in composite controls.
WTD-593.
---
 platform/features/layout/bundle.json               | 14 ++++++--------
 .../forms/res/templates/controls/composite.html    |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/platform/features/layout/bundle.json b/platform/features/layout/bundle.json
index c29fe94f92..2434865d80 100644
--- a/platform/features/layout/bundle.json
+++ b/platform/features/layout/bundle.json
@@ -18,15 +18,14 @@
                         "items": [
                             {
                                 "name": "Width (px)",
-                                "control": "textfield",
-                                "pattern": "^(\\d*[1-9]\\d*)?$"
+                                "control": "textfield"
                             },
                             {
                                 "name": "Height (px)",
-                                "control": "textfield",
-                                "pattern": "^(\\d*[1-9]\\d*)?$"
+                                "control": "textfield"
                             }
                         ],
+                        "pattern": "^(\\d*[1-9]\\d*)?$",
                         "property": "preferredSize",
                         "conversion": "number[]"
                     },
@@ -36,15 +35,14 @@
                         "items": [
                             {
                                 "name": "Horizontal grid (px)",
-                                "control": "textfield",
-                                "pattern": "^(\\d*[1-9]\\d*)?$"
+                                "control": "textfield"
                             },
                             {
                                 "name": "Vertical grid (px)",
-                                "control": "textfield",
-                                "pattern": "^(\\d*[1-9]\\d*)?$"
+                                "control": "textfield"
                             }
                         ],
+                        "pattern": "^(\\d*[1-9]\\d*)?$",
                         "property": "layoutGrid",
                         "conversion": "number[]"
                     },
diff --git a/platform/forms/res/templates/controls/composite.html b/platform/forms/res/templates/controls/composite.html
index b9c217654f..7b1585a48a 100644
--- a/platform/forms/res/templates/controls/composite.html
+++ b/platform/forms/res/templates/controls/composite.html
@@ -1,7 +1,7 @@
 <ng-form name="mctFormItem" ng-repeat="item in structure.items">
     <mct-control key="item.control"
                  ng-model="ngModel[field]"
-                 ng-required="item.required"
+                 ng-required="ngRequired"
                  ng-pattern="ngPattern"
                  options="item.options"
                  structure="row"