Merge branch 'release/0.12.5'

entrecode · May 5, 2017 · 794c114 · 794c114
2 parents da49de5 + d80b778
commit 794c114
Show file tree

Hide file tree

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

diff --git a/build/datamanager.js b/build/datamanager.js
@@ -1507,7 +1507,7 @@ Entry.prototype.getTitle = function(property) {
   if (!links) {
     return undefined;
   }
-  if (links.length === 1) {
+  if (!Array.isArray(this.value[property])) {
     return links[0].title;
   }
   var out = [];

diff --git a/build/datamanager.min.js b/build/datamanager.min.js
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,7 @@
 # Changelog
+## 0.12.5
+- fix: always return array in getTitle on lineked types
+
 ## 0.12.4
 - best file functions in Entry
 

diff --git a/lib/Entry.js b/lib/Entry.js
@@ -104,7 +104,7 @@ Entry.prototype.getTitle = function(property) {
   if (!links) {
     return undefined;
   }
-  if (links.length === 1) {
+  if (!Array.isArray(this.value[property])) {
     return links[0].title;
   }
   var out = [];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ec.datamanager",
-  "version": "0.12.4",
+  "version": "0.12.5",
   "description": "JavaScript SDK for ec.datamanager. By entrecode.",
   "main": "index.js",
   "typings": "typings.d.ts",

diff --git a/test/mocks/datamanager/api/58b9a1f5/to-do-list/get.200.single-item-one-link.json b/test/mocks/datamanager/api/58b9a1f5/to-do-list/get.200.single-item-one-link.json
@@ -13,9 +13,7 @@
     "modified": "2015-12-08T09:55:15.171Z",
     "private": false,
     "title": "Single Item List",
-    "list-items": [
-      "N1GJuenPEl"
-    ],
+    "list-item": "N1GJuenPEl",
     "description": "",
     "_modelTitleField": "title",
     "_links": {
@@ -25,7 +23,7 @@
       "self": {
         "href": "https://datamanager.entrecode.de/api/58b9a1f5/to-do-list?_id=V1EXdcJHl"
       },
-      "58b9a1f5:to-do-list/list-items": {
+      "58b9a1f5:to-do-list/list-item": {
         "href": "https://datamanager.entrecode.de/api/58b9a1f5/to-do-item?_id=N1GJuenPEl",
         "name": "to-do-item",
         "title": "NewItem"

diff --git a/test/sdk.test.js b/test/sdk.test.js
@@ -1748,7 +1748,7 @@ describe('entry/entries', function() { // this is basically modelList
   });
   it('get link title single link', function() {
     return dm.model('to-do-list').entry('V1EXdcJHl').then(function(entry) {
-      var title = entry.getTitle('list-items');
+      var title = entry.getTitle('list-item');
       expect(title).to.be.equal('NewItem');
     });
   });
@@ -1760,7 +1760,7 @@ describe('entry/entries', function() { // this is basically modelList
   });
   it('get model title single link', function() {
     return dm.model('to-do-list').entry('V1EXdcJHl').then(function(entry) {
-      var title = entry.getModelTitle('list-items');
+      var title = entry.getModelTitle('list-item');
       expect(title).to.be.equal('to-do-item');
     });
   });