From 3c89e6f3fe602b40007f6f846167abdf083f9e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Krenzer?= Date: Mon, 18 May 2020 18:37:16 +0200 Subject: [PATCH 1/2] Handle scopeProperty like property Removed a negation so scopeProperty will be handled like property. This negation collided with how the RTF query-generator assigned scopeproperty. --- lib/taskjuggler/Query.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/taskjuggler/Query.rb b/lib/taskjuggler/Query.rb index 2026bae2..3a148c7f 100644 --- a/lib/taskjuggler/Query.rb +++ b/lib/taskjuggler/Query.rb @@ -154,7 +154,7 @@ def process end # Same for the scope property. - if !@scopeProperty.nil? && !@scopePropertyId.nil? + if @scopeProperty.nil? && !@scopePropertyId.nil? @scopeProperty = resolvePropertyId(@scopePropertyType, @scopePropertyId) unless @scopeProperty From c67ac4933ef6bb0f7c1a81b6634ab17476bacc6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Krenzer?= Date: Mon, 18 May 2020 18:40:34 +0200 Subject: [PATCH 2/2] Set task as scopeproperty for resources-list --- lib/taskjuggler/TaskScenario.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/taskjuggler/TaskScenario.rb b/lib/taskjuggler/TaskScenario.rb index d54b2d4c..33b1b8eb 100644 --- a/lib/taskjuggler/TaskScenario.rb +++ b/lib/taskjuggler/TaskScenario.rb @@ -1508,6 +1508,7 @@ def query_resources(query) end q = query.dup q.property = resource + q.scopeProperty = @property rti.setQuery(q) list << "#{rti.to_s}" else