Remote revision history use item preview modal

This commit is contained in:
Mo Bitar
2018-07-20 09:54:33 -05:00
parent 0720e71637
commit bc28ad78de
5 changed files with 6 additions and 35 deletions

View File

@@ -11,8 +11,6 @@ class ActionsMenu {
controller($scope, modelManager, actionsManager) {
'ngInject';
$scope.renderData = {};
$scope.extensions = actionsManager.extensions.sort((a, b) => {return a.name.toLowerCase() > b.name.toLowerCase()});
for(let ext of $scope.extensions) {
@@ -51,11 +49,7 @@ class ActionsMenu {
switch (action.verb) {
case "render": {
var item = response.item;
if(item.content_type == "Note") {
$scope.renderData.title = item.title;
$scope.renderData.text = item.text;
$scope.renderData.showRenderModal = true;
}
actionsManager.presentRevisionPreviewModal(item);
}
}
}
@@ -77,8 +71,6 @@ class ActionsMenu {
}
})
}
}
}

View File

@@ -32,9 +32,11 @@ class RevisionPreviewModal {
item = modelManager.createItem({content_type: "Note", content: contentCopy});
modelManager.addItem(item);
} else {
item = modelManager.findItem($scope.revision.itemUuid);
// revision can be an ItemRevision revision object or just a plain SFItem
var uuid = $scope.revision.uuid;
item = modelManager.findItem(uuid);
item.content = Object.assign({}, $scope.revision.content);
item.mapContentToLocalProperties(item.content);
modelManager.mapResponseItemsToLocalModels([item], SFModelManager.MappingSourceRemoteActionRetrieved);
}
item.setDirty(true);
syncManager.sync();

View File

@@ -227,7 +227,7 @@ class ItemRevision {
} else {
this.date = date;
}
this.itemUuid = item.uuid;
this.uuid = item.uuid;
this.hasPreviousRevision = previousRevision != null;
this.content = Object.assign({}, item.content);
}