Merge pull request #99 from glogiotatidis/1138382

[fix bug 1138382] Add Body variable type.
mozmeao · Mar 19, 2015 · e94b26b · e94b26b
2 parents 45b9e40 + e8736d9
commit e94b26b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/snippets/base/admin.py b/snippets/base/admin.py
@@ -199,7 +199,7 @@ def lookup_allowed(self, key, value):
     def text(self, obj):
         data = json.loads(obj.data)
         text_keys = (obj.template.variable_set
-                        .filter(type=models.SnippetTemplateVariable.TEXT)
+                        .filter(type=models.SnippetTemplateVariable.BODY)
                         .values_list('name', flat=True))
 
         return ' '.join(wrap('\n'.join([data[key][:500] for key in text_keys if data.get(key)])))

diff --git a/snippets/base/models.py b/snippets/base/models.py
@@ -197,8 +197,9 @@ class SnippetTemplateVariable(CachingMixin, models.Model):
     IMAGE = 1
     SMALLTEXT = 2
     CHECKBOX = 3
-    TYPE_CHOICES = ((TEXT, 'Text'), (IMAGE, 'Image'), (SMALLTEXT, 'Small Text'),
-                    (CHECKBOX, 'Checkbox'))
+    BODY = 4
+    TYPE_CHOICES = ((BODY, 'Main Text'), (TEXT, 'Text'), (SMALLTEXT, 'Small Text'),
+                    (IMAGE, 'Image'), (CHECKBOX, 'Checkbox') )
 
     template = models.ForeignKey(SnippetTemplate, related_name='variable_set')
     name = models.CharField(max_length=255)

diff --git a/snippets/base/static/js/templateDataWidget.js b/snippets/base/static/js/templateDataWidget.js
@@ -7,6 +7,7 @@
         image: 1,
         smalltext: 2,
         checkbox: 3,
+        body: 4
     };
 
     // Setup Nunjucks
@@ -79,15 +80,15 @@
     SnippetDataWidget.prototype = {
         bindEvents: function() {
             var self = this;
-            
+
             $(document).ready(function() {
                 self.$container.find('img').each(function(_, img) {
                     if (!img.src) return;
                     var data = img.src.split(',')[1];
                     var binary = atob(data.replace(/\s/g, ''));
 
                     if (binary.length / 1024 > self.snippetImgSizeThreshold) {
-                        var msg = 'Icon file too large. Consider using a smaller ' + 
+                        var msg = 'Icon file too large. Consider using a smaller ' +
                                   'icon. (Under ' + self.snippetImgSizeThreshold + 'kb)';
                         $(img).siblings('.fileSize').html(msg).css('color', 'red');
                     } else {
@@ -171,7 +172,7 @@
             }
 
             if (file.size / 1024 > self.snippetImgSizeThreshold) {
-                var msg = 'Icon file too large. Consider using a smaller ' + 
+                var msg = 'Icon file too large. Consider using a smaller ' +
                           'icon. (Under ' + self.snippetImgSizeThreshold + 'kb)';
                 $(input).siblings('.fileSize').html(msg).css('color', 'red');
             } else {
@@ -198,6 +199,7 @@
                 var variable = $item.data('variable');
 
                 switch ($item.data('type')) {
+                    case VARIABLE_TYPES.body:
                     case VARIABLE_TYPES.text:
                         data[variable] = $item.find('textarea').val();
                         break;

diff --git a/snippets/base/static/templates/snippetDataWidget.html b/snippets/base/static/templates/snippetDataWidget.html
@@ -7,7 +7,7 @@
     <tr class="variable" data-variable="{{ variable.name }}" data-type="{{ variable.type }}">
       <td class="variable-name">{{ variable.name }}</td>
       <td>
-        {% if variable.type == types.text %}
+        {% if variable.type == types.text or variable.type == types.body %}
           <textarea>{{ originalData[variable.name] }}</textarea>
         {% elif variable.type == types.image %}
           <img src="{{ originalData[variable.name] }}">