Merge branch 'release/0.4.5'

Conflicts: package.json
entrecode · Sep 28, 2015 · caa7b99 · caa7b99
2 parents 9db9611 + 74bc97b
commit caa7b99
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "ec.datamanager.js",
   "main": "build/datamanager.js",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "authors": [
     "Ruben Deyhle <deyhle@entrecode.de>"
   ],

diff --git a/build/datamanager.js b/build/datamanager.js
diff --git a/lib/DataManager.js b/lib/DataManager.js
@@ -74,6 +74,9 @@ function optionsToQueryParameter(options) {
   if (options && options.hasOwnProperty('sort') && Array.isArray(options.sort)) {
     query.sort = options.sort.join(',');
   }
+  if (options && options.hasOwnProperty('levels')) {
+    query._levels = options.levels;
+  }
   if (options && options.hasOwnProperty('filter')) {
     for (var key in options.filter) {
       if (options.filter.hasOwnProperty(key)) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ec.datamanager",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "JavaScript SDK for ec.datamanager. By entrecode.",
   "main": "index.js",
   "directories": {

diff --git a/readme.md b/readme.md
@@ -93,7 +93,7 @@ dataManager.model('myModel').entryList({size: 100, sort: ['property', '-date']})
 ### Get Entries
 
 ```js
-dataManager.model('myModel').entries({size: 100, sort: ['property' , '-date'])
+dataManager.model('myModel').entries({size: 100, sort: ['property' , '-date'], "levels": 3)
 .then(function(entries) {
    console.log(entries); // success! array of Entries
 })