提交: 74cae90557ab9516a9ef677f0b18d89faea60f51 - allura (git)

allura

Commit MetaInfo

• 修订版: 74cae90557ab9516a9ef677f0b18d89faea60f51 (tree)
• 时间: 2012-05-04 02:22:13
• 作者: Jenny Steele <jsteele@geek...>
• Commiter: Yaroslav Luzin

Log Message

[#4113] Neighborhood and project GA tracking now checks to make sure feature is enabled for the neighborhood

更改概述

• modified: Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
• modified: Allura/allura/templates/jinja_master/theme_macros.html
• modified: Allura/allura/templates/widgets/neighborhood_overview_form.html
• modified: Allura/allura/tests/functional/test_neighborhood.py

差异

--- a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
@@ -38,9 +38,11 @@
            {% if value.support_page == '_url' %} checked{% endif %}>
     <label for="support_page_url_cb">URL: </label>
     <input type="text" name="support_page_url" value="{{value.support_page_url}}" style="width: 70%">
+    {% if value.neighborhood.features['google_analytics'] %}
     {{ widget.display_label(widget.fields.tracking_id) }}
     <br>
     {{widget.display_field(widget.fields.tracking_id) }}
+    {% endif %}
   </div>
   <div class="grid-9">
 

--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -42,11 +42,13 @@
     {% if account -%}
         _add_tracking('sfnt', '{{account}}');
     {%- endif %}
-    {% if project and project.neighborhood.tracking_id -%}
-        _add_tracking('nbhd', '{{project.neighborhood.tracking_id}}');
-    {%- endif %}
-    {% if project and project.tracking_id -%}
-        _add_tracking('proj', '{{project.tracking_id}}');
+    {% if project and project.neighborhood.features['google_analytics'] -%}
+      {% if project.neighborhood.tracking_id -%}
+          _add_tracking('nbhd', '{{project.neighborhood.tracking_id}}');
+      {%- endif %}
+      {% if project.tracking_id -%}
+          _add_tracking('proj', '{{project.tracking_id}}');
+      {%- endif %}
     {%- endif %}
 
     (function() {

--- a/Allura/allura/templates/widgets/neighborhood_overview_form.html
+++ b/Allura/allura/templates/widgets/neighborhood_overview_form.html
@@ -24,8 +24,10 @@
       {{widget.display_field(widget.fields.icon)}}
     </div>
   {% endif %}
+  {% if value.features and value.features['google_analytics'] %}
     <label class="grid-4">Analytics Tracking ID</label>
     <div class="grid-14">{{widget.display_field(widget.fields.tracking_id)}}</div>
+  {% endif %}
     <label class="grid-4">&nbsp;</label>
     <div class="grid-14"><input type="submit" value="Save"/></div>
   </form>

--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -48,6 +48,8 @@ class TestNeighborhood(TestController):
         r = self.app.get('/adobe/_admin/', extra_environ=dict(username='root'))
         r = self.app.get('/adobe/_admin/overview', extra_environ=dict(username='root'))
         r = self.app.get('/adobe/_admin/accolades', extra_environ=dict(username='root'))
+        neighborhood = M.Neighborhood.query.get(name='Adobe')
+        neighborhood.features['google_analytics'] = True
         r = self.app.post('/adobe/_admin/update',
                           params=dict(name='Mozq1', css='', homepage='# MozQ1!', tracking_id='U-123456'),
                           extra_environ=dict(username='root'))
@@ -112,6 +114,34 @@ class TestNeighborhood(TestController):
         image = Image.open(StringIO(r.body))
         assert image.size == (48,48)
 
+    def test_google_analytics(self):
+        # analytics allowed
+        neighborhood = M.Neighborhood.query.get(name='Adobe')
+        neighborhood.features['google_analytics'] = True
+        r = self.app.get('/adobe/_admin/overview', extra_environ=dict(username='root'))
+        assert 'Analytics Tracking ID' in r
+        r = self.app.get('/adobe/adobe-1/admin/overview', extra_environ=dict(username='root'))
+        assert 'Analytics Tracking ID' in r
+        r = self.app.post('/adobe/_admin/update',
+                          params=dict(name='Adobe', css='', homepage='# MozQ1', tracking_id='U-123456'),
+                          extra_environ=dict(username='root'))
+        r = self.app.post('/adobe/adobe-1/admin/update',
+                          params=dict(tracking_id='U-654321'),
+                          extra_environ=dict(username='root'))
+        r = self.app.get('/adobe/adobe-1/admin/overview', extra_environ=dict(username='root'))
+        assert "_add_tracking('nbhd', 'U-123456');" in r
+        assert "_add_tracking('proj', 'U-654321');" in r
+        # analytics not allowed
+        neighborhood = M.Neighborhood.query.get(name='Adobe')
+        neighborhood.features['google_analytics'] = False
+        r = self.app.get('/adobe/_admin/overview', extra_environ=dict(username='root'))
+        assert 'Analytics Tracking ID' not in r
+        r = self.app.get('/adobe/adobe-1/admin/overview', extra_environ=dict(username='root'))
+        assert 'Analytics Tracking ID' not in r
+        r = self.app.get('/adobe/adobe-1/admin/overview', extra_environ=dict(username='root'))
+        assert "_add_tracking('nbhd', 'U-123456');" not in r
+        assert "_add_tracking('proj', 'U-654321');" not in r
+
     def test_custom_css(self):
         test_css = '.test{color:red;}'
         custom_css = 'Custom CSS'