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 branch '3.8' into fix-latest-merge

Browse Source 
Conflicts:
	README.md
	composer.json
	composer.lock
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php
	lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/API/V1/result.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/schedulerState.php
	lib/classes/module/console/schedulerStop.php
	lib/classes/module/console/taskrun.php
	lib/classes/set/export.php
	lib/conf.d/_GV_template.inc
	lib/conf.d/configuration.yml
	templates/web/admin/setup.html.twig
	templates/web/admin/tasks/list.html.twig
	templates/web/api/auth/end_user_authorization.html.twig
	templates/web/prod/actions/Feedback/list.html.twig
	templates/web/prod/actions/publish/publish.html.twig
	templates/web/prod/upload/upload.html.twig
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/api/v1/api_v1_resultTest.php
This commit is contained in:
Nicolas Le Goff
2014-08-11 20:28:03 +02:00
parent 8994232022 26190331ed
commit 2899f152fb
2067 changed files with 123662 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -392,22 +392,25 @@ $(document).ready(function () {
//on submit file
$('#fileupload', UploaderManager.getContainer()).bind('fileuploadsubmit', function (e, data) {
var $this = $(this);
var params = [];
data.formData = [];
//get form datas attached to the file
var dataCollection = [];
var pushData = function(k, d) {
dataCollection.push(d);
};
$.each(data.context.find('input, select').serializeArray(), pushData)
$.each($("input", $('.collection-status:visible', UploaderManager.getSettingsBox())).serializeArray(), pushData);
$.each($("select", UploaderManager.getSettingsBox()).serializeArray(), pushData);
params.push(data.context.find('input, select').serializeArray());
params.push($("input", $('.collection-status:visible', UploaderManager.getSettingsBox())).serializeArray());
params.push($("select", UploaderManager.getSettingsBox()).serializeArray());
$.each(params, function(i, p) {
$.each(p, function (i, f){
data.formData.push(f);
});
});
dataCollection.push({
"name": "b64_image",
"value": data["b64_image"]
});
data.formData = dataCollection;
//remove current context
data.context.remove();