diff mbox

[Branch,~linaro-validation/lava-server/trunk] Rev 379: allow settings.conf to define OPENID_LAUNCHPAD_TEAMS_MAPPING

Message ID 20120614220409.15509.59538.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson June 14, 2012, 10:04 p.m. UTC 
Merge authors:
  Michael Hudson-Doyle (mwhudson)
Related merge proposals:
  https://code.launchpad.net/~mwhudson/lava-server/allow-openid-mapping/+merge/110226
  proposed by: Michael Hudson-Doyle (mwhudson)
  review: Approve - Andy Doan (doanac)
------------------------------------------------------------
revno: 379 [merge]
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Fri 2012-06-15 08:58:57 +1200
message:
  allow settings.conf to define OPENID_LAUNCHPAD_TEAMS_MAPPING
modified:
  doc/changes.rst
  lava_server/settings/debian.py


--
lp:lava-server
https://code.launchpad.net/~linaro-validation/lava-server/trunk

You are subscribed to branch lp:lava-server.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'doc/changes.rst'
--- doc/changes.rst	2012-06-08 00:09:55 +0000
+++ doc/changes.rst	2012-06-14 20:58:57 +0000
@@ -7,6 +7,7 @@ 
 ============
 
 * Unreleased.
+* Allow settings.conf to define OPENID_LAUNCHPAD_TEAMS_MAPPING.
 * Added configurable OpenID redirect domain support for login.
 
 .. _version_0_14:

=== modified file 'lava_server/settings/debian.py'
--- lava_server/settings/debian.py	2012-06-08 00:09:55 +0000
+++ lava_server/settings/debian.py	2012-06-14 04:24:48 +0000
@@ -83,5 +83,9 @@ 
 if debian_settings.get_setting("ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS"):
     ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS = debian_settings.get_setting("ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS")
 
+if debian_settings.get_setting("OPENID_LAUNCHPAD_TEAMS_MAPPING"):
+    OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO = False
+    OPENID_LAUNCHPAD_TEAMS_MAPPING = debian_settings.get_setting("OPENID_LAUNCHPAD_TEAMS_MAPPING")
+
 # Load extensions
 loader.contribute_to_settings(locals(), debian_settings)