ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-19 16:40:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed creation

Browse Source
This commit is contained in:
Henry 2016-04-20 17:43:26 -07:00
parent 836b5db8cf
commit 5bf750c90c
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform/commonUI/browse/src/creation/CreateAction.js
View File

@ -83,6 +83,7 @@ define(
CreateAction.prototype.perform = function () {
var newModel = this.type.getInitialModel(),
parentObject = this.navigationService.getNavigation(),
editorCapability,
newObject;
newModel.type = this.type.getKey();
@ -90,12 +91,18 @@ define(
newObject.useCapability('mutation', function(model){
model.location = parentObject.getId();
});
editorCapability = newObject.getCapability("editor");
if (countEditableViews(newObject) > 0 && newObject.hasCapability('composition')) {
this.navigationService.setNavigation(newObject);
newObject.getCapability("action").perform("edit");
return newObject.getCapability("action").perform("edit");
} else {
return newObject.getCapability('action').perform('save');
editorCapability.edit();
return newObject.useCapability("action").perform("save").then(function () {
return editorCapability.save();
}, function () {
return editorCapability.cancel()
});
}
};

2
platform/commonUI/edit/src/actions/SaveAction.js
View File

@ -60,7 +60,7 @@ define(
// during editing.
function doSave() {
return domainObject.getCapability("editor").save()
.then(resolveWith(domainObject.getOriginalObject()));
.then(resolveWith(domainObject));
}
// Discard the current root view (which will be the editing

3
platform/commonUI/edit/src/actions/SaveAsAction.js
View File

@ -157,8 +157,7 @@ define(
SaveAsAction.appliesTo = function (context) {
var domainObject = (context || {}).domainObject;
return domainObject !== undefined &&
domainObject.hasCapability("editor") &&
domainObject.getCapability("editor").inEditContext() &&
domainObject.getCapability("status").get("editing") &&
domainObject.getModel().persisted === undefined;
};