dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18758
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-03-30 18:27:53 +0200
message:
  minor
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js	2015-03-30 13:21:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js	2015-03-30 16:27:53 +0000
@@ -403,7 +403,7 @@
 	                                            ' ng-model="selectedTei.' + attId + '" ' +
 	                                            ' ng-disabled="editingDisabled"' +
 	                                            ' ng-blur="validationAndSkipLogic(selectedTei,\'' + attId + '\')" ' +
-	                                            ' ng-required=" ' + att.mandatory || att.unique + '"> ';
+	                                            ' ng-required=" ' + (att.mandatory || att.unique) + '"> ';
 	                        }                                               
 	                        else if(att.valueType === "optionSet"){
 	                            var optionSetId = att.optionSet.id;                            
@@ -422,7 +422,7 @@
 	                                            ' typeahead="option.name as option.name for option in optionSets.' + optionSetId + '.options | filter:$viewValue | limitTo:50"' +
 	                                            ' typeahead-open-on-focus ' +
 	                                            ' ng-blur="validationAndSkipLogic(selectedTei,\'' + attId + '\')" ' +
-	                                            ' ng-required=" ' + att.mandatory || att.unique + '"> ';                            
+	                                            ' ng-required=" ' + (att.mandatory || att.unique) + '"> ';                            
 	                        }
 	                        else if(att.valueType === "bool"){
 	                            newInputField = '<select ' +
@@ -433,7 +433,7 @@
 	                                            ' ng-model="selectedTei.' + attId + '" ' +
 	                                            ' ng-disabled="editingDisabled"' +
 	                                            ' ng-change="validationAndSkipLogic(selectedTei,\'' + attId + '\')" ' +
-	                                            ' ng-required=" ' + att.mandatory || att.unique + '"> ' +
+	                                            ' ng-required=" ' + (att.mandatory || att.unique) + '"> ' +
 	                                            ' <option value="">{{\'please_select\'| translate}}</option>' +
 	                                            ' <option value="false">{{\'no\'| translate}}</option>' + 
 	                                            ' <option value="true">{{\'yes\'| translate}}</option>' +
@@ -452,7 +452,7 @@
 	                                            ' d2-date' +
 	                                            ' d2-validation ' +
 	                                            ' blur-or-change="validationAndSkipLogic(selectedTei,\'' + attId + '\')" ' +
-	                                            ' ng-required=" ' + att.mandatory || att.unique + '"> ';
+	                                            ' ng-required=" ' + (att.mandatory || att.unique) + '"> ';
 	                        }
 	                        else if(att.valueType === "trueOnly"){
 	                            newInputField = '<input type="checkbox" ' +  
@@ -464,7 +464,7 @@
 	                                            ' ng-model="selectedTei.' + attId + '" ' +
 	                                            ' ng-disabled="editingDisabled"' +
 	                                            ' ng-change="validationAndSkipLogic(selectedTei,\'' + attId + '\')" ' +
-	                                            ' ng-required=" ' + att.mandatory || att.unique + '"> ';
+	                                            ' ng-required=" ' + (att.mandatory || att.unique) + '"> ';
 	                        }
 	                        else if(att.valueType === "email"){
 	                            newInputField = '<input type="email" ' +    
@@ -476,7 +476,7 @@
 	                                            ' ng-model="selectedTei.' + attId + '" ' +
 	                                            ' ng-disabled="editingDisabled"' +
 	                                            ' ng-blur="validationAndSkipLogic(selectedTei,\'' + attId + '\')" ' +
-	                                            ' ng-required=" ' + att.mandatory || att.unique + '"> ';
+	                                            ' ng-required=" ' + (att.mandatory || att.unique) + '"> ';
 	                        }
 	                        else {
 	                            newInputField = '<input type="text" ' +
@@ -488,7 +488,7 @@
 	                                            ' ng-model="selectedTei.' + attId + '" ' +
 	                                            ' ng-disabled="editingDisabled"' +
 	                                            ' ng-blur="validationAndSkipLogic(selectedTei,\'' + attId + '\')" ' +
-	                                            ' ng-required=" ' + att.mandatory || att.unique + '"> ';
+	                                            ' ng-required=" ' + (att.mandatory || att.unique) + '"> ';
 	                        }
                        }