Merge branch '4921-extended-admin-case-delete' into 4923-manifest-node-not-deleted-unless-manifest-deleted

This commit is contained in:
Richard Cordovano 2019-04-08 13:12:25 -04:00
commit 7877da3e7e
2 changed files with 3 additions and 4 deletions

View File

@ -198,7 +198,6 @@ DeleteCaseTask.progress.deletingResourcesLockNode=Deleting case resources znode.
DeleteCaseTask.progress.gettingManifestPaths=Getting manifest file paths...
# {0} - manifest file path
DeleteCaseTask.progress.lockingManifest=Locking manifest file {0}...
DeleteCaseTask.progress.Manifest=Deleting manifest file {0}...
DeleteCaseTask.progress.openingCaseDatabase=Opening the case database...
DeleteCaseTask.progress.openingCaseMetadataFile=Opening case metadata file...
# {0} - manifest file path

View File

@ -39,7 +39,7 @@ final class CasesDashboardCustomizer implements MultiUserCaseBrowserCustomizer {
private final DeleteCaseAction deleteCaseAction;
private final DeleteCaseInputAction deleteCaseInputAction;
private final DeleteCaseOutputAction deleteCaseOutputAction;
private final DeleteCaseInputAndOutputAction deleteAllAction;
private final DeleteCaseInputAndOutputAction deleteCaseInputAndOutputAction;
/**
* Constructs a customizer for the multi-user case browser panel used in the
@ -57,7 +57,7 @@ final class CasesDashboardCustomizer implements MultiUserCaseBrowserCustomizer {
deleteCaseAction = new DeleteCaseAction();
deleteCaseInputAction = new DeleteCaseInputAction();
deleteCaseOutputAction = new DeleteCaseOutputAction();
deleteAllAction = new DeleteCaseInputAndOutputAction();
deleteCaseInputAndOutputAction = new DeleteCaseInputAndOutputAction();
}
@Override
@ -96,7 +96,7 @@ final class CasesDashboardCustomizer implements MultiUserCaseBrowserCustomizer {
if (CasesDashboardCustomizer.extendedFeaturesAreEnabled()) {
actions.add(deleteCaseInputAction);
actions.add(deleteCaseOutputAction);
actions.add(deleteAllAction);
actions.add(deleteCaseInputAndOutputAction);
} else {
actions.add(deleteCaseAction);
}