mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-28 11:36:44 +00:00
- Allow for "cascade" installed items - i.e. support multi-level installed items (cherry picked from commit 94f7890a4150c3d8da0e53faa3ab938e05ff5943) Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
parent
4c6e3490c0
commit
3715c42fed
@ -429,7 +429,7 @@ class StockItem(
|
||||
'parameters': self.part.parameters_map(),
|
||||
'quantity': InvenTree.helpers.normalize(self.quantity),
|
||||
'result_list': self.testResultList(include_installed=True),
|
||||
'results': self.testResultMap(include_installed=True),
|
||||
'results': self.testResultMap(include_installed=True, cascade=True),
|
||||
'serial': self.serial,
|
||||
'stock_item': self,
|
||||
'tests': self.testResultMap(),
|
||||
@ -2406,6 +2406,7 @@ class StockItem(
|
||||
"""
|
||||
# Do we wish to include test results from installed items?
|
||||
include_installed = kwargs.pop('include_installed', False)
|
||||
cascade = kwargs.pop('cascade', False)
|
||||
|
||||
# Filter results by "date", so that newer results
|
||||
# will override older ones.
|
||||
@ -2416,9 +2417,6 @@ class StockItem(
|
||||
for result in results:
|
||||
result_map[result.key] = result
|
||||
|
||||
# Do we wish to "cascade" and include test results from installed stock items?
|
||||
cascade = kwargs.get('cascade', False)
|
||||
|
||||
if include_installed:
|
||||
installed_items = self.get_installed_items(cascade=cascade)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user