Skip to content

Commit fcc7c3d

Browse files
committed
Merge pull request #28 from yllieth/fix-Datasets
fix Datasets isParent function to include scoreset and bump to 0.6.1
2 parents 7fd539c + 68272cc commit fcc7c3d

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "predicsis_ml_sdk-javascript",
3-
"version": "0.6.0",
3+
"version": "0.6.1",
44
"authors": [
55
"Yllieth <[email protected]>",
66
"Dehau"
@@ -35,4 +35,4 @@
3535
"devDependencies": {
3636
"angular-mocks": "~1.3.15"
3737
}
38-
}
38+
}

dist/predicsis-jsSDK.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,12 +733,11 @@ angular
733733
* @methodOf predicsis.jsSDK.models.Datasets
734734
* @name isParent
735735
* @description Tells if a dataset is a parent dataset.
736-
* <b>Note:</b> A parent may have any children, but its <kbd>dataset_id</kbd> must be null
737736
* @param {Object} dataset Instance of {@link predicsis.jsSDK.models.Datasets dataset}
738737
* @return {Boolean} <kbd>true</kbd> / <kbd>false</kbd>
739738
*/
740739
this.isParent = function(dataset) {
741-
return Boolean(dataset.type === 'uploaded_dataset');
740+
return Boolean(dataset.type === 'uploaded_dataset') || this.isScore(dataset);
742741
};
743742

744743
/**

dist/predicsis-jsSDK.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/predicsis-jsSDK.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/model/Datasets.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,12 +506,11 @@ angular
506506
* @methodOf predicsis.jsSDK.models.Datasets
507507
* @name isParent
508508
* @description Tells if a dataset is a parent dataset.
509-
* <b>Note:</b> A parent may have any children, but its <kbd>dataset_id</kbd> must be null
510509
* @param {Object} dataset Instance of {@link predicsis.jsSDK.models.Datasets dataset}
511510
* @return {Boolean} <kbd>true</kbd> / <kbd>false</kbd>
512511
*/
513512
this.isParent = function(dataset) {
514-
return Boolean(dataset.type === 'uploaded_dataset');
513+
return Boolean(dataset.type === 'uploaded_dataset') || this.isScore(dataset);
515514
};
516515

517516
/**

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "predicsis_ml_sdk-javascript",
3-
"version": "0.6.0",
3+
"version": "0.6.1",
44
"description": "Javascript SDK for PredicSis ML API",
55
"main": "index.js",
66
"scripts": {
@@ -42,4 +42,4 @@
4242
"load-grunt-tasks": "^3.1.0",
4343
"phantomjs": "^1.9.16"
4444
}
45-
}
45+
}

0 commit comments

Comments
 (0)