From d11c92d7998e0a0bbd7db0c104438e628a62f9b8 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Thu, 19 Sep 2013 16:05:38 -0400
Subject: [PATCH] Set the URL on the collection instead of the model.

---
 cms/static/coffee/spec/models/asset_spec.coffee | 11 -----------
 cms/static/coffee/spec/views/assets_spec.coffee |  2 ++
 cms/static/js/models/asset.js                   |  4 ----
 cms/templates/asset_index.html                  |  2 +-
 4 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 cms/static/coffee/spec/models/asset_spec.coffee

diff --git a/cms/static/coffee/spec/models/asset_spec.coffee b/cms/static/coffee/spec/models/asset_spec.coffee
deleted file mode 100644
index 4ff380f298..0000000000
--- a/cms/static/coffee/spec/models/asset_spec.coffee
+++ /dev/null
@@ -1,11 +0,0 @@
-describe "CMS.Models.Asset", ->
-    beforeEach ->
-        CMS.URL.UPDATE_ASSET = "/update_asset/"
-        @model = new CMS.Models.Asset({id: "/c4x/id"})
-
-    afterEach ->
-        delete CMS.URL.UPDATE_ASSET
-
-    it "should have a url set", ->
-        expect(@model.url()).toEqual("/update_asset//c4x/id")
-
diff --git a/cms/static/coffee/spec/views/assets_spec.coffee b/cms/static/coffee/spec/views/assets_spec.coffee
index 6d20263a48..f4f67f682c 100644
--- a/cms/static/coffee/spec/views/assets_spec.coffee
+++ b/cms/static/coffee/spec/views/assets_spec.coffee
@@ -9,6 +9,7 @@ describe "CMS.Views.Asset", ->
         @model = new CMS.Models.Asset({display_name: "test asset", url: 'actual_asset_url', portable_url: 'portable_url', date_added: 'date', thumbnail: null, id: 'id'})
         spyOn(@model, "destroy").andCallThrough()
         @collection = new CMS.Models.AssetCollection([@model])
+        @collection.url = "update-asset-url"
         @view = new CMS.Views.Asset({model: @model})
 
         @promptSpies = spyOnConstructor(CMS.Views.Prompt, "Warning", ["show", "hide"])
@@ -82,6 +83,7 @@ describe "CMS.Views.Assets", ->
                 {display_name: "test asset 1", url: 'actual_asset_url_1', portable_url: 'portable_url_1', date_added: 'date_1', thumbnail: null, id: 'id_1'},
                 {display_name: "test asset 2", url: 'actual_asset_url_2', portable_url: 'portable_url_2', date_added: 'date_2', thumbnail: null, id: 'id_2'}
             ])
+        @collection.url = "update-asset-url"
         @view = new CMS.Views.Assets({collection: @collection, el: $('#asset_table_body')})
 
         @promptSpies = spyOnConstructor(CMS.Views.Prompt, "Warning", ["show", "hide"])
diff --git a/cms/static/js/models/asset.js b/cms/static/js/models/asset.js
index 68b052b8e7..080f5a5e5e 100644
--- a/cms/static/js/models/asset.js
+++ b/cms/static/js/models/asset.js
@@ -9,9 +9,5 @@ CMS.Models.Asset = Backbone.Model.extend({
         url: "",
         portable_url: "",
         is_locked: false
-    },
-
-    url: function() {
-        return CMS.URL.UPDATE_ASSET + this.id;
     }
 });
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 348d7577da..3d9ef598ef 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -18,8 +18,8 @@
     <script src="${static.url('js/vendor/jQuery-File-Upload/js/jquery.fileupload.js')}"> </script>
 
     <script type="text/javascript">
-        CMS.URL.UPDATE_ASSET = "${update_asset_callback_url}";
         var assets = new CMS.Models.AssetCollection(${asset_list});
+        assets.url = "${update_asset_callback_url}";
         var assetsView = new CMS.Views.Assets({collection: assets, el: $('#asset_table_body')});
 
         $(document).ready(function() {