Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug related to img link for non-img files.

Browse Source 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/135-via-tender-studio-asset-locker-currently-returns-incorrect-xml-snippet
This commit is contained in:
cahrens
2013-01-16 13:51:17 -05:00
parent cc5a5e2996
commit d4f79c0498
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/static/js/base.js
View File

@@ -498,7 +498,7 @@ function displayFinishedUpload(xhr) {
}
var resp = JSON.parse(xhr.responseText);
$('.upload-modal .embeddable-xml-input').val('<img src="' + xhr.getResponseHeader('asset_url') + '"/>');
$('.upload-modal .embeddable-xml-input').val(xhr.getResponseHeader('asset_url'));
$('.upload-modal .embeddable').show();
$('.upload-modal .file-name').hide();
$('.upload-modal .progress-fill').html(resp.msg);

8
cms/templates/asset_index.html
View File

@@ -28,7 +28,7 @@
{{uploadDate}}
</td>
<td class="embed-col">
<input type="text" class="embeddable-xml-input" value='{{url}}'>
<input type="text" class="embeddable-xml-input" value='{{url}}' disabled>
</td>
</tr>
</script>
@@ -69,7 +69,7 @@
${asset['uploadDate']}
</td>
<td class="embed-col">
<input type="text" class="embeddable-xml-input" value='${asset['url']}'>
<input type="text" class="embeddable-xml-input" value="${asset['url']}" disabled>
</td>
</tr>
% endfor
@@ -99,8 +99,8 @@
<div class="progress-fill"></div>
</div>
<div class="embeddable">
<label>Embeddable XML:</label>
<input type="text" class="embeddable-xml-input" value='<img src=""/>'>
<label>URL:</label>
<input type="text" class="embeddable-xml-input" value='' disabled>
</div>
<form class="file-chooser" action="${upload_asset_callback_url}"
method="post" enctype="multipart/form-data">