Fix asset manager for multi-image blocks

tangentlabs · Jun 19, 2014 · ace714f · ace714f
1 parent d22989f
commit ace714f
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 11 deletions.
diff --git a/fancypages/assets/forms/widgets.py b/fancypages/assets/forms/widgets.py
@@ -43,6 +43,7 @@ def render(self, name, value, attrs=None):
         return tmpl.render(Context({
             'rendered_widgets': rendered_widgets,
             'asset': self.get_asset(*value),
+            'input_name': name,
         }))
 
     def get_widget_id(self, name, idx):

diff --git a/fancypages/static/fancypages/dist/js/dashboard.min.js b/fancypages/static/fancypages/dist/js/dashboard.min.js
diff --git a/fancypages/static/fancypages/dist/js/fancypages.min.js b/fancypages/static/fancypages/dist/js/fancypages.min.js
diff --git a/fancypages/static/fancypages/dist/js/libs.min.js b/fancypages/static/fancypages/dist/js/libs.min.js
diff --git a/fancypages/static/fancypages/dist/libs/rangeslider/rangeslider.min.js b/fancypages/static/fancypages/dist/libs/rangeslider/rangeslider.min.js
diff --git a/fancypages/static/fancypages/dist/libs/wysihtml5/wysihtml5-0.3.0.min.js b/fancypages/static/fancypages/dist/libs/wysihtml5/wysihtml5-0.3.0.min.js
diff --git a/fancypages/static/fancypages/src/js/views.js b/fancypages/static/fancypages/src/js/views.js
@@ -385,13 +385,24 @@ FancypageApp.module('Views', function (Views, FancypageApp, Backbone, Marionette
         selectAsset: function () {
             var button = $('a', this.$el);
             this.$el.addClass('editing');
+            this.origin = button.data('input-name');
 
-            this.trigger('select-image-clicked', button.data('heading'), button.data('iframe-src'));
+            this.trigger(
+              'select-image-clicked',
+              button.data('heading'),
+              button.data('iframe-src'),
+              this.origin
+            );
         },
-        setSelectedAsset: function (type, id, url) {
+        setSelectedAsset: function (type, id, url, origin) {
             this.$el.removeClass('editing');
 
-            $("input", this.$el).attr('value', id);
+            if (origin !== this.origin) {
+              return false;
+            }
+
+            $("input[name=" + this.origin + "]", this.$el).attr('value', id);
+            $("input[name=" + this.origin + "_type]", this.$el).attr('value', type);
             $("img", this.$el).attr('src', url);
         }
     });
@@ -468,15 +479,18 @@ FancypageApp.module('Views', function (Views, FancypageApp, Backbone, Marionette
             _.bindAll(this, 'hideModal');
             _.bindAll(this, 'triggerAssetUpdatedEvent');
 
+            this.origin = null;
             this.$iframe = null;
             this.template = _.template($('#fullscreen-modal-template').html() || '');
             this.iframeTemplate = _.template("<iframe frameborder='0' width='99%' height='360'></iframe>");
 
             this.on("image-asset-updated", this.hideModal);
         },
-        showModal: function (heading, url) {
+        showModal: function (heading, url, inputId) {
             var self = this;
 
+            this.origin = inputId;
+
             this.$el.html(this.template({
                 heading: heading,
                 bodyHtml: this.iframeTemplate()
@@ -509,7 +523,8 @@ FancypageApp.module('Views', function (Views, FancypageApp, Backbone, Marionette
                 id = target.data('asset-id'),
                 url = $('img', target).attr('src');
 
-            this.trigger("image-asset-updated", type, id, url);
+            this.trigger("image-asset-updated", type, id, url, this.origin);
+            this.origin = null;
         }
     });
 

diff --git a/fancypages/templates/fancypages/assets/forms/asset_widget.html b/fancypages/templates/fancypages/assets/forms/asset_widget.html
@@ -15,7 +15,7 @@
     <a data-behaviours="load-asset-modal"
        data-target="#fullscreen-modal"
        data-heading="Select or upload an image"
-       data-iframe-id="asset-manager"
+       data-input-name="{{ input_name }}"
        data-iframe-src="{% url "fp-dashboard:image-list" %}"
        class="fp-btn-danger fp-btn fp-btn-block">
         {% trans "Library" %}