For #42202: Added seed_entity_field to nav_search functions.

daigles · web-flow · commit b43cd65041d5 · 2017-05-04T16:10:58.000-04:00
diff --git a/shotgun_api3/shotgun.py b/shotgun_api3/shotgun.py
@@ -2895,7 +2895,7 @@ def nav_expand(self, path, seed_entity_field=None, entity_fields=None):
             }
         )
 
-    def nav_search_string(self, root_path, search_string):
+    def nav_search_string(self, root_path, search_string, seed_entity_field=None):
         """
         Search function adapted to work with the navigation hierarchy.
 
@@ -2909,11 +2909,12 @@ def nav_search_string(self, root_path, search_string):
                 "nav_search",
                 {
                     "root_path":root_path,
+                    "seed_entity_field": seed_entity_field,
                     "search_criteria": { "search_string": search_string }
                 }
         )
 
-    def nav_search_entity(self, root_path, entity):
+    def nav_search_entity(self, root_path, entity, seed_entity_field=None):
         """
         Search function adapted to work with the navigation hierarchy.
 
@@ -2928,6 +2929,7 @@ def nav_search_entity(self, root_path, entity):
                 "nav_search",
                 {
                     "root_path": root_path,
+                    "seed_entity_field": seed_entity_field,
                     "search_criteria": {"entity": entity }
                 }
         )

Original file line number	Diff line number	Diff line change
`@@ -2895,7 +2895,7 @@ def nav_expand(self, path, seed_entity_field=None, entity_fields=None):`
`2895`	`2895`	`}`
`2896`	`2896`	`)`
`2897`	`2897`
`2898`		`- def nav_search_string(self, root_path, search_string):`
	`2898`	`+ def nav_search_string(self, root_path, search_string, seed_entity_field=None):`
`2899`	`2899`	`"""`
`2900`	`2900`	`Search function adapted to work with the navigation hierarchy.`
`2901`	`2901`
`@@ -2909,11 +2909,12 @@ def nav_search_string(self, root_path, search_string):`
`2909`	`2909`	`"nav_search",`
`2910`	`2910`	`{`
`2911`	`2911`	`"root_path":root_path,`
	`2912`	`+ "seed_entity_field": seed_entity_field,`
`2912`	`2913`	`"search_criteria": { "search_string": search_string }`
`2913`	`2914`	`}`
`2914`	`2915`	`)`
`2915`	`2916`
`2916`		`- def nav_search_entity(self, root_path, entity):`
	`2917`	`+ def nav_search_entity(self, root_path, entity, seed_entity_field=None):`
`2917`	`2918`	`"""`
`2918`	`2919`	`Search function adapted to work with the navigation hierarchy.`
`2919`	`2920`
`@@ -2928,6 +2929,7 @@ def nav_search_entity(self, root_path, entity):`
`2928`	`2929`	`"nav_search",`
`2929`	`2930`	`{`
`2930`	`2931`	`"root_path": root_path,`
	`2932`	`+ "seed_entity_field": seed_entity_field,`
`2931`	`2933`	`"search_criteria": {"entity": entity }`
`2932`	`2934`	`}`
`2933`	`2935`	`)`