fix(forms): getError does not work without path

angular · Jun 12, 2015 · a858f6a · a858f6a
1 parent cee2682
commit a858f6a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/modules/angular2/src/forms/model.ts b/modules/angular2/src/forms/model.ts
@@ -123,7 +123,7 @@ export class AbstractControl {
   find(path: List<string | number>| string): AbstractControl { return _find(this, path); }
 
   getError(errorCode: string, path: List<string> = null) {
-    var c = this.find(path);
+    var c = isPresent(path) && !ListWrapper.isEmpty(path) ? this.find(path) : this;
     if (isPresent(c) && isPresent(c._errors)) {
       return StringMapWrapper.get(c._errors, errorCode);
     } else {

diff --git a/modules/angular2/test/forms/model_spec.ts b/modules/angular2/test/forms/model_spec.ts
@@ -335,12 +335,14 @@ export function main() {
           it("should return the error when it is present", () => {
             var c = new Control("", Validators.required);
             var g = new ControlGroup({"one": c});
+            expect(c.getError("required")).toEqual(true);
             expect(g.getError("required", ["one"])).toEqual(true);
           });
 
           it("should return null otherwise", () => {
             var c = new Control("not empty", Validators.required);
             var g = new ControlGroup({"one": c});
+            expect(c.getError("invalid")).toEqual(null);
             expect(g.getError("required", ["one"])).toEqual(null);
             expect(g.getError("required", ["invalid"])).toEqual(null);
           });