chore(dependency) Specify Angular 1.3 as angular-ui apparently has pr…

…oblems with 1.4 angular-ui/bootstrap#3620 angular-ui/bootstrap#3662 angular-ui/bootstrap#3693 angular-ui/bootstrap#3726 angular-ui/bootstrap#3730
forms-angular · Jun 2, 2015 · 88c0d50 · 88c0d50
1 parent d16057a
commit 88c0d50
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/bower.json b/bower.json
@@ -18,16 +18,16 @@
     "dist/forms-angular.js"
   ],
   "dependencies": {
-    "angular": ">=1.3.0",
-    "angular-sanitize": ">=1.3.0",
-    "angular-messages": ">=1.3.0",
+    "angular": "~1.3",
+    "angular-sanitize": "~1.3",
+    "angular-messages": "~1.3",
     "angular-ui-bootstrap-bower": ">=0.8.0",
     "underscore": "1.8.2",
     "ngInfiniteScroll": "^1.2",
     "angular-elastic": "~2"
   },
   "devDependencies": {
-    "angular-mocks": ">=1.3.0",
+    "angular-mocks": "~1.3",
     "bootstrap-3-1-1": "git://github.com/twbs/bootstrap.git#v3.1.1",
     "bootstrap-2-3-2": "git://github.com/twbs/bootstrap.git#v2.3.2"
   },
@@ -44,6 +44,6 @@
     "package.json"
   ],
   "resolutions": {
-    "angular": ">=1.3.0"
+    "angular": "~1.3"
   }
 }
diff --git a/dist/forms-angular-with-bs2.css b/dist/forms-angular-with-bs2.css
diff --git a/dist/forms-angular-with-bs3.css b/dist/forms-angular-with-bs3.css
diff --git a/server/data_form.js b/server/data_form.js
diff --git a/server/data_form.ts b/server/data_form.ts
@@ -79,6 +79,9 @@ DataForm.prototype.getListFields = function (resource, doc) {
   if (listFields) {
     for (; listElement < listFields.length; listElement++) {
         if (typeof doc[listFields[listElement].field] !== 'undefined') {
+
+
+
             display += doc[listFields[listElement].field] + ' ';
         }
     }
@@ -153,7 +156,7 @@ DataForm.prototype.addResource = function (resourceName, model, options) {
     }
   }
 
-  extend(resource.options, this.preprocess(resource.model.schema.paths, null));
+  extend(resource.options, this.preprocess(resource.model.schema['paths'], null));
 
   if (resource.options.searchImportance) {
     this.searchFunc = async.forEachSeries;