Merge pull request #125 from openmrs/RA-2106

RA-2106: UI Commons: Navigator: properly clear out values for a set o…

Author: mogoodrich

omod/src/main/webapp/resources/scripts/navigator/navigatorModels.js

@@ -191,9 +191,9 @@ FieldModel.prototype.resetValue = function() {
     if (selectedOption.length > 0) {
         selectedOption.removeAttr('selected');
     }
-    // TODO expand to handle the case of a *set* of radio buttons being a single field?
-    else if (this.element.attr('type') == 'radio' && this.element.is(':checked')) {
+    else if (this.element.attr('type') == 'radio') {
         this.element.removeAttr('checked');
+        this.element.siblings('input[type="radio"]').removeAttr('checked');
     }
     // handle checkbox
     else if (this.element.attr('type') == 'checkbox') {

omod/src/test/webapp/resources/scripts/navigatorModels.js

@@ -197,14 +197,32 @@ describe("Test for simple form models", function() {
 
         it("should reset the value of radio set field", function() {
             var fieldModel = new FieldModel();
-            var element = jasmine.createSpyObj('element', ['removeAttr', 'removeClass', 'show', 'attr','is', 'find', 'val' ]);
+            var element = jasmine.createSpyObj('element', ['removeAttr', 'removeClass', 'show', 'attr', 'is', 'find', 'val']);
             fieldModel.element = element;
             element.find = jasmine.createSpy('find() spy').and.returnValue([]);
             element.attr = jasmine.createSpy('attr() spy').and.returnValue('radio');
-            element.is = jasmine.createSpy('is() spy').and.returnValue(true);
+            var siblings = jasmine.createSpyObj('siblings', ['removeAttr']);
+            element.siblings = jasmine.createSpy('siblings() spy').and.returnValue(siblings);
 
             fieldModel.resetValue();
             expect(element.removeAttr).toHaveBeenCalledWith("checked");
+            expect(element.siblings).toHaveBeenCalledWith('input[type="radio"]');
+            expect(siblings.removeAttr).toHaveBeenCalledWith("checked");
+        })
+
+        it("should reset checked on all sibling radio buttons in a radio set with multiple options", function() {
+            var fieldModel = new FieldModel();
+            var firstRadio = jasmine.createSpyObj('firstRadio', ['removeAttr', 'removeClass', 'show', 'attr', 'is', 'find', 'val']);
+            fieldModel.element = firstRadio;
+            firstRadio.find = jasmine.createSpy('find() spy').and.returnValue([]);
+            firstRadio.attr = jasmine.createSpy('attr() spy').and.returnValue('radio');
+            var otherRadios = jasmine.createSpyObj('otherRadios', ['removeAttr']);
+            firstRadio.siblings = jasmine.createSpy('siblings() spy').and.returnValue(otherRadios);
+
+            fieldModel.resetValue();
+            expect(firstRadio.removeAttr).toHaveBeenCalledWith("checked");
+            expect(firstRadio.siblings).toHaveBeenCalledWith('input[type="radio"]');
+            expect(otherRadios.removeAttr).toHaveBeenCalledWith("checked");
         })
 
     });