@@ -509,7 +509,7 @@ var fng;
509509 if ( angular . isArray ( scope [ fieldInfo . options ] ) ) {
510510 enumInstruction = { repeat : fieldInfo . options , value : 'option' } ;
511511 }
512- else if ( angular . isArray ( scope [ fieldInfo . options ] . values ) ) {
512+ else if ( scope [ fieldInfo . options ] && angular . isArray ( scope [ fieldInfo . options ] . values ) ) {
513513 if ( angular . isArray ( scope [ fieldInfo . options ] . labels ) ) {
514514 enumInstruction = {
515515 repeat : fieldInfo . options + '.values' ,
@@ -2965,7 +2965,10 @@ var fng;
29652965 // Do nothing with these - handled elsewhere (and deprecated)
29662966 void ( schemaEntry . select2 ) ;
29672967 }
2968- else if ( fieldValue && $scope . conversions [ schemaEntry . name ] && $scope . conversions [ schemaEntry . name ] . fngajax ) {
2968+ else if ( fieldValue &&
2969+ $scope . conversions [ schemaEntry . name ] &&
2970+ $scope . conversions [ schemaEntry . name ] . fngajax &&
2971+ ! $scope . conversions [ schemaEntry . name ] . noconvert ) {
29692972 var conversionEntry = schemaEntry ;
29702973 $scope . conversions [ conversionEntry . name ] . fngajax ( fieldValue , conversionEntry , function ( updateEntry , value ) {
29712974 // Update the master and (preserving pristine if appropriate) the record
@@ -3675,4 +3678,4 @@ angular.module("formsAngular").run(["$templateCache", function($templateCache) {
36753678$templateCache . put ( "form-button-bs2.html" , "<div class=\"form-btn-grp\">\n <div class=\"btn-group pull-right\">\n <button id=\"saveButton\" class=\"btn btn-mini btn-primary form-btn\" ng-click=\"save()\" ng-disabled=\"isSaveDisabled()\"><i class=\"icon-ok\"></i> Save</button>\n <button id=\"cancelButton\" class=\"btn btn-mini btn-warning form-btn\" ng-click=\"cancel()\" ng-disabled=\"isCancelDisabled()\"><i class=\"icon-remove\"></i> Cancel</button>\n </div>\n <div class=\"btn-group pull-right\">\n <button id=\"newButton\" class=\"btn btn-mini btn-success form-btn\" ng-click=\"newClick()\" ng-disabled=\"isNewDisabled()\"><i class=\"icon-plus\"></i> New</button>\n <button id=\"deleteButton\" class=\"btn btn-mini btn-danger form-btn\" ng-click=\"deleteClick()\" ng-disabled=\"isDeleteDisabled()\"><i class=\"icon-minus\"></i> Delete</button>\n </div>\n</div>\n" ) ;
36763679$templateCache . put ( "form-button-bs3.html" , "<div class=\"form-btn-grp\">\n <div class=\"btn-group pull-right\">\n <button id=\"saveButton\" class=\"btn btn-primary form-btn btn-xs\" ng-click=\"save()\" ng-disabled=\"isSaveDisabled()\"><i class=\"glyphicon glyphicon-ok\"></i> Save</button>\n <button id=\"cancelButton\" class=\"btn btn-warning form-btn btn-xs\" ng-click=\"cancel()\" ng-disabled=\"isCancelDisabled()\"><i class=\"glyphicon glyphicon-remove\"></i> Cancel</button>\n </div>\n <div class=\"btn-group pull-right\">\n <button id=\"newButton\" class=\"btn btn-success form-btn btn-xs\" ng-click=\"newClick()\" ng-disabled=\"isNewDisabled()\"><i class=\"glyphicon glyphicon-plus\"></i> New</button>\n <button id=\"deleteButton\" class=\"btn btn-danger form-btn btn-xs\" ng-click=\"deleteClick()\" ng-disabled=\"isDeleteDisabled()\"><i class=\"glyphicon glyphicon-minus\"></i> Delete</button>\n </div>\n</div>\n" ) ;
36773680$templateCache . put ( "search-bs2.html" , "<form class=\"navbar-search pull-right\">\n <div id=\"search-cg\" class=\"control-group\" ng-class=\"errorClass\">\n <input type=\"text\" id=\"searchinput\" ng-model=\"searchTarget\" class=\"search-query\" placeholder=\"{{searchPlaceholder}}\" ng-keyup=\"handleKey($event)\">\n </div>\n</form>\n<div class=\"results-container\" ng-show=\"results.length >= 1\">\n <div class=\"search-results\">\n <div ng-repeat=\"result in results\">\n <span ng-class=\"resultClass($index)\" ng-click=\"selectResult($index)\">{{result.resourceText}} {{result.text}}</span>\n </div>\n <div ng-show=\"moreCount > 0\">(plus more - continue typing to narrow down search...)\n </div>\n </div>\n</div>\n" ) ;
3678- $templateCache . put ( "search-bs3.html" , "<form class=\"pull-right navbar-form\">\n <div id=\"search-cg\" class=\"form-group\" ng-class=\"errorClass\">\n <input type=\"text\" id=\"searchinput\" ng-model=\"searchTarget\" class=\"search-query form-control\" placeholder=\"{{searchPlaceholder}}\" ng-keyup=\"handleKey($event)\">\n </div>\n</form>\n<div class=\"results-container\" ng-show=\"results.length >= 1\">\n <div class=\"search-results\">\n <div ng-repeat=\"result in results\">\n <span ng-class=\"resultClass($index)\" ng-click=\"selectResult($index)\">{{result.resourceText}} {{result.text}}</span>\n </div>\n <div ng-show=\"moreCount > 0\">(plus more - continue typing to narrow down search...)\n </div>\n </div>\n</div>\n" ) ; } ] ) ;
3681+ $templateCache . put ( "search-bs3.html" , "<form class=\"pull-right navbar-form\">\n <div id=\"search-cg\" class=\"form-group\" ng-class=\"errorClass\">\n <input type=\"text\" id=\"searchinput\" ng-model=\"searchTarget\" class=\"search-query form-control\" placeholder=\"{{searchPlaceholder}}\" ng-keyup=\"handleKey($event)\">\n </div>\n</form>\n<div class=\"results-container\" ng-show=\"results.length >= 1\">\n <div class=\"search-results\">\n <div ng-repeat=\"result in results\">\n <span ng-class=\"resultClass($index)\" ng-click=\"selectResult($index)\" title={{result.additional}} >{{result.resourceText}} {{result.text}}</span>\n </div>\n <div ng-show=\"moreCount > 0\">(plus more - continue typing to narrow down search...)\n </div>\n </div>\n</div>\n" ) ; } ] ) ;
0 commit comments