ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-19 15:43:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[Forms] Update selector controller

Browse Source 
Update controller for domain object selector, for WTD-987.
This commit is contained in:
Victor Woeltjen
2015-03-09 17:26:37 -07:00
parent 66e0d2fcfa
commit 26ba75f636
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platform/commonUI/general/src/controllers/SelectorController.js
View File

@ -28,7 +28,7 @@ define(
// Get the value of the field being edited
function getField() {
return $scope.ngModel[$scope.field];
return $scope.ngModel[$scope.field] || [];
}
// Get the value of the field being edited
@ -65,7 +65,7 @@ define(
}
// Look up objects by id, then populate right-hand list
objectService.get(ids).then(updateSelectedObjects);
objectService.getObjects(ids).then(updateSelectedObjects);
}
// Reject attempts to select objects of the wrong type
@ -75,7 +75,7 @@ define(
$scope.$watchCollection(getField, updateList);
// Look up root object, then store it
objectService.get(ROOT_ID).then(storeRoot);
objectService.getObjects([ROOT_ID]).then(storeRoot);
return {
/**
@ -112,8 +112,17 @@ define(
setField(list.filter(function (otherId) {
return otherId !== id;
}));
// Clear the current list selection
delete listModel.selectedObject;
}
},
/**
* Get the currently-selected domain objects.
* @returns {DomainObject[]} the current selection
*/
selected: function () {
return selectedObjects;
},
// Expose tree/list model for use in template directly
treeModel: treeModel,
listModel: listModel