alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/open723' into open-master

Browse Source
This commit is contained in:
bwyu
2015-02-03 17:26:53 -08:00
parent dfba9fd510 aa9ceeb2be
commit 107ed51cfc
6 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/commonUI/edit/src/actions/EditAction.js
View File

@@ -57,7 +57,11 @@ define(
* will be performed; should contain a `domainObject` property
*/
EditAction.appliesTo = function (context) {
return (context || {}).domainObject !== undefined;
var domainObject = (context || {}).domainObject,
type = domainObject && domainObject.getCapability('type');
// Only allow creatable types to be edited
return type && type.hasFeature('creation');
};
return EditAction;

11
platform/commonUI/edit/src/actions/PropertiesAction.js
View File

@@ -70,9 +70,14 @@ define(
* context.
*/
PropertiesAction.appliesTo = function (context) {
return (context || {}).domainObject &&
(context || {}).domainObject.hasCapability("type") &&
(context || {}).domainObject.hasCapability("persistence");
var domainObject = (context || {}).domainObject,
type = domainObject && domainObject.getCapability('type'),
creatable = type && type.hasFeature('creation');
// Only allow creatable types to be edited
return domainObject &&
domainObject.hasCapability("persistence") &&
creatable;
};
return PropertiesAction;

9
platform/commonUI/edit/src/actions/RemoveAction.js
View File

@@ -80,9 +80,14 @@ define(
RemoveAction.appliesTo = function (context) {
var object = (context || {}).domainObject,
contextCapability = object && object.getCapability("context"),
parent = contextCapability && contextCapability.getParent();
parent = contextCapability && contextCapability.getParent(),
parentType = parent && parent.getCapability('type'),
parentCreatable = parentType && parentType.hasFeature('creation');
// Only creatable types should be modifiable
return parent !== undefined &&
Array.isArray(parent.getModel().composition);
Array.isArray(parent.getModel().composition) &&
parentCreatable;
};
return RemoveAction;