mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-13 08:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
View File

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

6
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/CasesDashboardCustomizer.java
View File

@ -39,7 +39,7 @@ final class CasesDashboardCustomizer implements MultiUserCaseBrowserCustomizer {
private final DeleteCaseAction deleteCaseAction; private final DeleteCaseAction deleteCaseAction;
private final DeleteCaseInputAction deleteCaseInputAction; private final DeleteCaseInputAction deleteCaseInputAction;
private final DeleteCaseOutputAction deleteCaseOutputAction; 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 * 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(); deleteCaseAction = new DeleteCaseAction();
deleteCaseInputAction = new DeleteCaseInputAction(); deleteCaseInputAction = new DeleteCaseInputAction();
deleteCaseOutputAction = new DeleteCaseOutputAction(); deleteCaseOutputAction = new DeleteCaseOutputAction();
deleteAllAction = new DeleteCaseInputAndOutputAction(); deleteCaseInputAndOutputAction = new DeleteCaseInputAndOutputAction();
} }
@Override @Override
@ -96,7 +96,7 @@ final class CasesDashboardCustomizer implements MultiUserCaseBrowserCustomizer {
if (CasesDashboardCustomizer.extendedFeaturesAreEnabled()) { if (CasesDashboardCustomizer.extendedFeaturesAreEnabled()) {
actions.add(deleteCaseInputAction); actions.add(deleteCaseInputAction);
actions.add(deleteCaseOutputAction); actions.add(deleteCaseOutputAction);
actions.add(deleteAllAction); actions.add(deleteCaseInputAndOutputAction);
} else { } else {
actions.add(deleteCaseAction); actions.add(deleteCaseAction);
} }