mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-12 07:56:16 +00:00
Merge pull request #7328 from APriestman/8055_corrAttrFilePath
8055 Use data source name in CR file_name column
This commit is contained in:
commit
486bf1074a
@ -578,7 +578,7 @@ public class CorrelationAttributeUtil {
|
||||
value,
|
||||
correlationCase,
|
||||
CorrelationDataSource.fromTSKDataSource(correlationCase, dataSrc),
|
||||
"",
|
||||
srcContent.getName(),
|
||||
"",
|
||||
TskData.FileKnown.UNKNOWN,
|
||||
srcContent.getId());
|
||||
@ -807,7 +807,7 @@ public class CorrelationAttributeUtil {
|
||||
accountAddr.get(),
|
||||
correlationCase,
|
||||
CorrelationDataSource.fromTSKDataSource(correlationCase, dataSource),
|
||||
"",
|
||||
dataSource.getName(),
|
||||
"",
|
||||
TskData.FileKnown.KNOWN,
|
||||
account.getId());
|
||||
|
@ -117,6 +117,9 @@ final public class CentralRepoCommonAttributeInstance extends AbstractCommonAttr
|
||||
|
||||
// Create the parent path. Make sure not to add a separator if there is already one there.
|
||||
String parentPath = fileFromPath.getParent();
|
||||
if (parentPath == null) {
|
||||
return null;
|
||||
}
|
||||
if (!parentPath.endsWith(File.separator)) {
|
||||
parentPath += File.separator;
|
||||
}
|
||||
|
@ -128,7 +128,7 @@ public final class InterCasePanel extends javax.swing.JPanel {
|
||||
}
|
||||
});
|
||||
for (CorrelationAttributeInstance.Type type : types) {
|
||||
if (! type.getDbTableName().contains("os_account") && ! type.getDbTableName().contains("installed_program")) {
|
||||
if (! type.getDbTableName().contains("os_account")) {
|
||||
correlationTypeFilters.put(type.getDisplayName(), type);
|
||||
this.correlationTypeComboBox.addItem(type.getDisplayName());
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user