Merge pull request #3406 from smotornyuk/3398-depend-on-group-in-reso…

…urce-config Groups inside resource.config can't be dependent on another groups
ckan · Feb 9, 2017 · 8b2c01a · 8b2c01a
2 parents 7190281 + d5a636c
commit 8b2c01a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
@@ -157,8 +157,12 @@ def create_resource(path, lib_name, count, inline=False):
                 if resource not in depends:
                     depends[resource] = []
                 for dep in depends[group]:
-                    if dep not in depends[resource]:
-                        depends[resource].append(dep)
+                    if dep not in groups:
+                        dep_resources = [dep]
+                    else:
+                        dep_resources = groups[dep]
+                    diff = [res for res in dep_resources if res not in depends[resource]]
+                    depends[resource].extend(diff)
 
     # process each .js/.css file found
     resource_list = []