hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1012 from nlegoff/fix1714

Browse Source 
[Ready][3.8] Fix #1714 First status is not applied on document after upload
This commit is contained in:
Romain Neutron
2014-03-04 14:25:04 +01:00
parent 6c3cdfc52e 85176bef9e
commit 2be779f30b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
templates/web/prod/upload/upload.html.twig
View File

@@ -396,17 +396,20 @@ $(document).ready(function () {
var $this = $(this); var $this = $(this);
//get form datas attached to the file //get form datas attached to the file
data.formData = $.extend( var dataCollection = [];
data.context.find('input, select').serializeArray(), var pushData = function(k, d) {
$("input", $('.collection-status:visible', UploaderManager.getSettingsBox())).serializeArray(), dataCollection.push(d);
$("select", UploaderManager.getSettingsBox()).serializeArray() };
); $.each(data.context.find('input, select').serializeArray(), pushData)
$.each($("input", $('.collection-status:visible', UploaderManager.getSettingsBox())).serializeArray(), pushData);
$.each($("select", UploaderManager.getSettingsBox()).serializeArray(), pushData);
data.formData.push({ dataCollection.push({
"name": "b64_image", "name": "b64_image",
"value": data["b64_image"] "value": data["b64_image"]
}); });
data.formData = dataCollection;
//remove current context //remove current context
data.context.remove(); data.context.remove();