[myexperiment-hackers] [2459] trunk/lib/authorization.rb: added option to always include the permissions join regardless of optimisation

[noreply]

Revision

2459

Author

dgc

Date

2010-07-05 22:36:52 -0400 (Mon, 05 Jul 2010)

Log Message

added option to always include the permissions join regardless of optimisation

Modified Paths

• trunk/lib/authorization.rb

Diff

Modified: trunk/lib/authorization.rb (2458 => 2459)

--- trunk/lib/authorization.rb	2010-07-06 02:30:25 UTC (rev 2458)
+++ trunk/lib/authorization.rb	2010-07-06 02:36:52 UTC (rev 2459)
@@ -829,7 +829,7 @@
     # add in the extra joins needed for the authorisation checks
 
     joins.push("INNER JOIN policies ON contributions.policy_id = policies.id")
-    joins.push("LEFT OUTER JOIN permissions ON policies.id = permissions.policy_id") if user_id
+    joins.push("LEFT OUTER JOIN permissions ON policies.id = permissions.policy_id") if user_id || opts[:include_permissions]
 
     # include the effective permissions in the result?