Fixes #711

adaptlearning · Jun 9, 2015 · 5cd333f · 5cd333f
1 parent be0a2be
commit 5cd333f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/frontend/src/core/assetManagement/views/assetManagementModalView.js b/frontend/src/core/assetManagement/views/assetManagementModalView.js
@@ -28,7 +28,8 @@ define(function(require) {
 
 	    setupSubViews: function() {
 	    	this.search = {};
-	    	var assetType = this.options.assetType.replace('Asset:', '');
+	    	// Replace Asset and : so we can have both filtered and all asset types
+	    	var assetType = this.options.assetType.replace('Asset', '').replace(':', '');
 	    	var filters = [assetType];
 	    	this.search.assetType = { $in: filters };
 		    // Push collection through to collection view

diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/core/scaffold/views/scaffoldAssetView.js
@@ -317,6 +317,7 @@ define(function(require) {
         Origin.scaffold.addCustomField('Asset:audio', ScaffoldAssetView);
         Origin.scaffold.addCustomField('Asset:video', ScaffoldAssetView);
         Origin.scaffold.addCustomField('Asset:other', ScaffoldAssetView);
+        Origin.scaffold.addCustomField('Asset', ScaffoldAssetView);
     })