changes to aggregation file path calculation
@@ -1430,6 +1430,11 @@ class AbstractLogicalFile(models.Model):
if self.is_fileset:
file_folder = self.folder
+ elif self.is_model_instance:
+ if self.folder is not None:
+ file_folder = self.folder
+ else:
+ file_folder = self.files.first().file_folder
else:
file_folder = self.files.first().file_folder
if file_folder:
