Don't show configuration section if captcha disabled

[Ryan J Ollos]

For example, even if reCAPTCHA and reCAPTCHA2 are disabled, the following is displayed on the Captcha admin page:

[Ryan J Ollos]

Proposed patch to address reCAPTCHA and reCAPTCHA2. I'll follow the same pattern for the other captcha types.

tracspamfilter/admin.py

@@ -29 +29 @@
 from tracspamfilter.captcha import ICaptchaMethod
 from tracspamfilter.captcha.keycaptcha import KeycaptchaCaptcha
 from tracspamfilter.captcha.recaptcha import RecaptchaCaptcha
+from tracspamfilter.captcha.recaptcha2 import Recaptcha2Captcha
 from tracspamfilter.filters.akismet import AkismetFilterStrategy
 from tracspamfilter.filters.blogspam import BlogSpamFilterStrategy
 from tracspamfilter.filters.botscout import BotScoutFilterStrategy
@@ -679 +680 @@
             captcha = self.config.get('spam-filter', 'captcha')
             captcha_karma_lifetime = self.config.get('spam-filter', 'captcha_karma_lifetime')
 
+            captcha_recaptcha_enabled = \
+                self.env.is_enabled(RecaptchaCaptcha) or \
+                self.env.is_enabled(Recaptcha2Captcha)
             captcha_recaptcha_private_key = self.config.get('spam-filter', 'captcha_recaptcha_private_key')
             captcha_recaptcha_public_key = self.config.get('spam-filter', 'captcha_recaptcha_public_key')
 
@@ -708 +712 @@
         data.update({'captcha': captcha,
                      'types': captchas,
                      'captcha_enabled': captcha_enabled,
+                     'captcha_recaptcha_enabled': captcha_recaptcha_enabled,
                      'captcha_recaptcha_private_key': captcha_recaptcha_private_key,
                      'captcha_recaptcha_public_key': captcha_recaptcha_public_key,
                      'captcha_keycaptcha_private_key': captcha_keycaptcha_private_key,

tracspamfilter/templates/admin_captcha.html

@@ -45 +45 @@
           </label>
       </div>
 
-      <fieldset>
+      <fieldset py:if="captcha_recaptcha_enabled">
         <legend>reCAPTCHA</legend>
         <p class="hint" i18n:msg="">
           The reCAPTCHA system provides a very good captcha system based on

[Ryan J Ollos]

Implemented in [14586]. Related changes in [14587].

[Ryan J Ollos]

New extraction in [14592].

Additional refactoring in:

• [14588]
• [14589] (inadvertently combined what should have been separate changesets)
• [14590:14591]