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

Reviewed edit mode checking

Browse Source
This commit is contained in:
Henry
2016-04-20 13:11:07 -07:00
parent 1753a5473c
commit 836b5db8cf
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,11 +87,10 @@ define(
*/ */
EditAction.appliesTo = function (context) { EditAction.appliesTo = function (context) {
var domainObject = (context || {}).domainObject, var domainObject = (context || {}).domainObject,
type = domainObject && domainObject.getCapability('type'), type = domainObject && domainObject.getCapability('type');
isEditMode = domainObject && domainObject.getDomainObject ? true : false;
// Only allow creatable types to be edited // Only allow creatable types to be edited
return type && type.hasFeature('creation') && !isEditMode; return type && type.hasFeature('creation') && !domainObject.getCapability('status').get('editing');
}; };
return EditAction; return EditAction;

2
platform/commonUI/edit/src/policies/EditableViewPolicy.js
View File

@ -37,7 +37,7 @@ define(
// If a view is flagged as non-editable, only allow it // If a view is flagged as non-editable, only allow it
// while we're not in Edit mode. // while we're not in Edit mode.
if ((view || {}).editable === false) { if ((view || {}).editable === false) {
return !(domainObject.hasCapability('editor') && domainObject.getCapability('status').get('editing')); return !(domainObject.hasCapability('editor') && domainObject.getCapability('editor').inEditContext());
} }
// Like all policies, allow by default. // Like all policies, allow by default.

3
platform/features/timeline/src/controllers/TimelineZoomController.js
View File

@ -57,7 +57,8 @@ define(
function storeZoom() { function storeZoom() {
var isEditMode = $scope.commit && var isEditMode = $scope.commit &&
$scope.domainObject && $scope.domainObject &&
$scope.domainObject.hasCapability('editor'); $scope.domainObject.hasCapability('editor') &&
$scope.domainObject.getCapability('editor').inEditContext();
if (isEditMode) { if (isEditMode) {
$scope.configuration = $scope.configuration || {}; $scope.configuration = $scope.configuration || {};
$scope.configuration.zoomLevel = zoomIndex; $scope.configuration.zoomLevel = zoomIndex;