Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dropfiles type after symfony BC in 2.8.31 #240

Merged
merged 24 commits into from
Sep 23, 2021
Merged

Fix dropfiles type after symfony BC in 2.8.31 #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a6e93fa
update symfony to ^2.8
davidbeig Jul 27, 2021
b3abc09
remove url from dropfiles in forms
davidbeig Jul 27, 2021
9366bb4
make uploadimagetransformer save image so that it updates the file name
davidbeig Jul 27, 2021
782178a
some fixes
davidbeig Jul 27, 2021
b7b3c08
fix user profile form to save avatar
davidbeig Aug 2, 2021
fc992c9
rework of dropfiles type and js
davidbeig Aug 20, 2021
bc077e0
rework of all forms with dropfiles
davidbeig Aug 20, 2021
5e7e45b
small fixes in model transformers
davidbeig Aug 20, 2021
b539e6a
remove unnecessary comments from Forms
davidbeig Sep 14, 2021
aa5622a
Fix AdminStoryEdit form so it can properly add, save and remove the 3…
carlos-mg89 Sep 14, 2021
6aa714b
Refactor to have a unique place where to handle additions, changes or…
carlos-mg89 Sep 14, 2021
0bcf870
Fix ProjectPostForm so it adds, edits and removes pictures correctly
carlos-mg89 Sep 14, 2021
b0a5b87
Feature: Project can share a url to a signature platform (#234)
davidbeig Sep 16, 2021
76c6889
make new project sign fields not required in translate overview form …
davidbeig Sep 17, 2021
3a83700
update composer.lock to symfony 2.8.52
davidbeig Sep 20, 2021
3a8af11
Merge branch 'live' into fix/dropfiles_symfony_bc
carlos-mg89 Sep 20, 2021
15dbc56
Fix AdminSdgEdit form in order to allow removing the Sdf icon
carlos-mg89 Sep 20, 2021
3c1a993
Merge branch 'fix/dropfiles_symfony_bc' of github.com:GoteoFoundation…
carlos-mg89 Sep 20, 2021
cafc6d6
Fix ProjectStory form, since it wasn't possible to upload, update or …
carlos-mg89 Sep 20, 2021
c95abbb
Fix Questionnaire form so it saves the uploaded image ID as the answe…
carlos-mg89 Sep 20, 2021
b2b7756
Merge branch 'staging' into fix/dropfiles_symfony_bc
carlos-mg89 Sep 22, 2021
7464eae
fixes on questionnaire form to handle upload of documents instead of …
davidbeig Sep 22, 2021
1d87c0d
Merge branch 'fix/dropfiles_symfony_bc' of github.com:GoteoFoundation…
davidbeig Sep 22, 2021
968a175
Refactor on DropfilesType to include constant and to separate the dif…
carlos-mg89 Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions Resources/templates/forms/bootstrap/dropfiles_widget.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

$uploads_name = $form['uploads']->vars['full_name'];
$current_name = $form['current']->vars['full_name'];
$removed_name = $form['removed']->vars['full_name'];
// $current_files = $value;
$current_files = is_array($value) ? $value : [$value];

// var_dump($current_files);die;
?>
<div class="dropfiles" data-text-upload="<?= $view->escape($text_upload) ?>" data-text-max-files-reached="<?= $view->escape($text_max_files_reached) ?>" data-text-file-type-error="<?= $view->escape($text_file_type_error) ?>" data-limit="<?= $limit ?>" data-multiple="<?= $attr['multiple'] ? 1 : 0 ?>" data-url="<?= $view->escape($url) ?>" data-current="<?= $view->escape($current_name) ?>" data-name="<?= $view->escape($uploads_name) ?>" data-markdown-link="<?= $view->escape($markdown_link) ?>" data-accepted-files="<?= $view->escape($accepted_files) ?>">
<div class="dropfiles" data-text-upload="<?= $view->escape($text_upload) ?>" data-text-max-files-reached="<?= $view->escape($text_max_files_reached) ?>" data-text-file-type-error="<?= $view->escape($text_file_type_error) ?>" data-limit="<?= $limit ?>" data-multiple="<?= $attr['multiple'] ? 1 : 0 ?>" data-url="<?= $view->escape($url) ?>" data-current="<?= $view->escape($current_name) ?>" data-name="<?= $view->escape($uploads_name) ?>" data-removed="<?= $view->escape($removed_name) ?>" data-markdown-link="<?= $view->escape($markdown_link) ?>" data-accepted-files="<?= $view->escape($accepted_files) ?>">
<div class="image-zone <?= $type ?>" data-section="<?= $key ?>">
<ul class="list-inline image-list-sortable" id="list-sortable-<?= $key ?>">
<?php foreach($current_files as $img) {
Expand All @@ -22,11 +23,14 @@
'text_send_to_markdown' => $text_send_to_markdown,
'text_delete_image' => $text_delete_image,
'text_download' => $text_download,
'hidden_input' => '<input type="hidden" name="' . $current_name . '" value="' . $view->escape($img->getName()) . '">'
'hidden_input' => '<input type="file" style="display: none" name="' . $current_name . '" value="' . $view->escape($img->getName()) . '">'
]);
}
} ?>
</ul>

<input type="text" style="display:none" name="<?= $removed_name ?>[]">

<div class="dragndrop"><div class="dropzone"></div></div>
</div>
<p class="text-danger error-msg hidden"></p>
Expand Down
38 changes: 19 additions & 19 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@
"iignatov/lightopenid": "~1.0",
"paypal/adaptivepayments-sdk-php": "*",
"paypal/merchant-sdk-php": "*",
"symfony/class-loader": "2.8.30",
"symfony/http-foundation": "2.8.30",
"symfony/routing": "2.8.30",
"symfony/http-kernel": "2.8.30",
"symfony/security": "2.8.30",
"symfony/config": "2.8.30",
"symfony/stopwatch": "2.8.30",
"symfony/dependency-injection": "2.8.30",
"symfony/debug": "2.8.30",
"symfony/console": "2.8.30",
"symfony/translation": "2.8.30",
"symfony/finder": "2.8.30",
"symfony/dom-crawler": "2.8.30",
"symfony/css-selector": "2.8.30",
"symfony/process": "2.8.30",
"symfony/form": "2.8.30",
"symfony/templating": "2.8.30",
"symfony/framework-bundle": "2.8.30",
"symfony/validator": "2.8.30",
"symfony/class-loader": "^2.8",
"symfony/http-foundation": "^2.8",
"symfony/routing": "^2.8",
"symfony/http-kernel": "^2.8",
"symfony/security": "^2.8",
"symfony/config": "^2.8",
"symfony/stopwatch": "^2.8",
"symfony/dependency-injection": "^2.8",
"symfony/debug": "^2.8",
"symfony/console": "^2.8",
"symfony/translation": "^2.8",
"symfony/finder": "^2.8",
"symfony/dom-crawler": "^2.8",
"symfony/css-selector": "^2.8",
"symfony/process": "^2.8",
"symfony/form": "^2.8",
"symfony/templating": "^2.8",
"symfony/framework-bundle": "^2.8",
"symfony/validator": "^2.8",
"symfony/yaml": "^3.3",
"monolog/monolog": "^1.17",
"gregwar/captcha": "^1.1",
Expand Down