Merge branch 'temp8-3298-move-rollback' of https://github.com/umbraco/Umbraco-CMS into temp8-3298-move-rollback
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
vm.variantVersions = [];
|
||||
vm.diff = null;
|
||||
vm.currentVersion = null;
|
||||
vm.rollbackButtonDisabled = true;
|
||||
|
||||
// find the current version for invariant nodes
|
||||
if($scope.model.node.variants.length === 1) {
|
||||
@@ -72,10 +73,12 @@
|
||||
vm.previousVersion = data;
|
||||
vm.previousVersion.versionId = version.versionId;
|
||||
createDiff(vm.currentVersion, vm.previousVersion);
|
||||
vm.rollbackButtonDisabled = false;
|
||||
});
|
||||
|
||||
} else {
|
||||
vm.diff = null;
|
||||
vm.rollbackButtonDisabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -93,6 +93,7 @@
|
||||
button-style="success"
|
||||
state="vm.rollbackButtonState"
|
||||
label-key="actions_rollback"
|
||||
disabled="vm.rollbackButtonDisabled"
|
||||
action="vm.rollback()">
|
||||
</umb-button>
|
||||
</umb-editor-footer-content-right>
|
||||
|
||||
Reference in New Issue
Block a user