From 8e970c7ac1d3a0d2f5003aee582ac187e0b4f8d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Wed, 2 Mar 2016 21:44:04 +0100
Subject: [PATCH] misc: don't display captcha option by default (#10168)

---
 tests/test_admin_pages.py | 1 +
 tests/utilities.py        | 9 ++++++---
 wcs/admin/forms.py        | 9 +++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/test_admin_pages.py b/tests/test_admin_pages.py
index 0847a37..c5c852e 100644
--- a/tests/test_admin_pages.py
+++ b/tests/test_admin_pages.py
@@ -805,6 +805,7 @@ def test_form_duplicate_field(pub):
     assert FormDef.get(1).fields[1].label == '1st field'
 
 def test_form_edit_field(pub):
+    create_superuser(pub)
     create_role()
 
     FormDef.wipe()
diff --git a/tests/utilities.py b/tests/utilities.py
index cc48daa..fd60a9d 100644
--- a/tests/utilities.py
+++ b/tests/utilities.py
@@ -94,10 +94,11 @@ def create_temporary_pub(sql_mode=False):
         return pub
 
     os.mkdir(pub.app_dir)
+    fd = file(os.path.join(pub.app_dir, 'site-options.cfg'), 'w')
+    fd.write('[options]\n')
+    fd.write('formdef-captcha-option = true\n')
     if sql_mode:
-        fd = file(os.path.join(pub.app_dir, 'site-options.cfg'), 'w')
-        fd.write('[options]\npostgresql = true\n')
-        fd.close()
+        fd.write('postgresql = true\n')
         conn = psycopg2.connect(user=os.environ['USER'])
         conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
         cur = conn.cursor()
@@ -114,6 +115,8 @@ def create_temporary_pub(sql_mode=False):
 
         conn.close()
 
+    fd.close()
+
     return pub
 
 def clean_temporary_pub():
diff --git a/wcs/admin/forms.py b/wcs/admin/forms.py
index 4532043..b826a13 100644
--- a/wcs/admin/forms.py
+++ b/wcs/admin/forms.py
@@ -458,10 +458,11 @@ class FormDefPage(Directory):
                 self.formdef.enable_tracking_codes and
                 C_('tracking code|Enabled') or C_('tracking code|Disabled'))
 
-        r += add_option_line('options/captcha',
-                _('CAPTCHA for anonymous users'),
-                self.formdef.has_captcha and
-                C_('captcha|Enabled') or C_('captcha|Disabled'))
+        if get_publisher().has_site_option('formdef-captcha-option'):
+            r += add_option_line('options/captcha',
+                    _('CAPTCHA for anonymous users'),
+                    self.formdef.has_captcha and
+                    C_('captcha|Enabled') or C_('captcha|Disabled'))
 
         online_status = C_('online status|Active')
         if self.formdef.disabled:
-- 
2.7.0