Estimated Audience field fix mozillahispano#32

bbotella · Nov 8, 2013 · 618d588 · 618d588
1 parent 12eb221
commit 618d588
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/mozbuzz/buzz/models.py b/mozbuzz/buzz/models.py
@@ -174,7 +174,7 @@ class Mention(SoftDeletableModel):
     feedback = models.IntegerField(max_length=1, choices=FEEDBACK_TYPES)
     previous_product_comments = models.IntegerField(max_length=1,
         choices=PREVIOUS_PRODUCT_COMMENTS)
-    estimated_audience = models.IntegerField()
+    estimated_audience = models.IntegerField(null=True, blank=True)
     relevant_audience = models.BooleanField()
     update_rate = models.IntegerField(max_length=1, choices=UPDATE_RATE)
     remarks = models.TextField(null=True, blank=True)

diff --git a/mozbuzz/buzz/templates/buzz/mention.html b/mozbuzz/buzz/templates/buzz/mention.html
@@ -37,6 +37,9 @@
                 {{field.errors}}
                 {{field.label_tag}}
                 {{field}}
+                {% if field.name == "estimated_audience" %}
+                    <input type="checkbox" name="estimated_audience_null_check" id="estimated_audience_null_check" value="estimated_audience_null_check" checked=true>{%trans "Unknown"%}
+                {% endif %}
                 <div id="field_{{field.name}}_result"></div>
             </div>
         {% endif %}
@@ -47,11 +50,26 @@
 {% endblock %}
 
 {% block extrascript %}
-    <script src="{{MEDIA_URL}}js/readability.js" type="text/javascript"></script>
-    <script src="{{MEDIA_URL}}js/to-markdown.js" type="text/javascript"></script>
-    <script src="{{MEDIA_URL}}js/mozreadability.js" type="text/javascript"></script>
+    <script src="{{STATIC_URL}}js/readability.js" type="text/javascript"></script>
+    <script src="{{STATIC_URL}}js/to-markdown.js" type="text/javascript"></script>
+    <script src="{{STATIC_URL}}js/mozreadability.js" type="text/javascript"></script>
     {% if is_new and form.initial.link|length > 10 %}
         <script type="text/javascript">guessInformation();</script>
     {% endif %}
     <script>
+        $("#id_estimated_audience").keyup(function() {
+            if ($("#id_estimated_audience").val().length==0) {
+                $("#estimated_audience_null_check").attr('checked', true);
+            } else {
+                $("#estimated_audience_null_check").attr('checked', false);
+            }
+        });
+
+        $('#estimated_audience_null_check').change(function() {
+            if($(this).is(":checked")) {
+                $("#id_estimated_audience").val("");
+            }
+        });
+        </script>
+
 {% endblock %}
diff --git a/mozbuzz/settings.py b/mozbuzz/settings.py
@@ -54,7 +54,7 @@
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = '/media/'
+MEDIA_URL = '/mozbuzz/media/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
@@ -64,7 +64,7 @@
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
+STATIC_URL = '/mozbuzz/static/'
 
 # Additional locations of static files
 STATICFILES_DIRS = (

diff --git a/mozbuzz/templates/base.html b/mozbuzz/templates/base.html
@@ -67,7 +67,7 @@ <h1>
     <script type="text/javascript">
      var URL_ROOT = "{% url "index" %}";
     </script>
-    <script src="{% static 'js/jquery.min.js' %}" type="text/javascript"></script>
+    <script src="{% static 'js/jquery-1.9.1.min.js' %}" type="text/javascript"></script>
     <script src="{% static 'js/jquery-ui.min.js' %}" type="text/javascript"></script>
     <script src="{% static 'js/mozbuzz.js' %}" type="text/javascript"></script>
     {% browserid_js %}