Skip to content

Commit ae14508

Browse files
sescandellsescandell
committed
Update CollectionUpload to 2.8|3.0 format
Move CollectionUploadType to UploadCollectionType
1 parent 005c383 commit ae14508

26 files changed

+55
-82
lines changed

‎DependencyInjection/AdmingeneratorFormExtensionsExtension.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function load(array $configs, ContainerBuilder $container)
3737
$container->setParameter('admingenerator.form.include_blueimp', $config['include_blueimp']);
3838
$container->setParameter('admingenerator.form.include_gmaps', $config['include_gmaps']);
3939

40-
$this->loadCollectionUploadListener($config['collection_upload'], $container);
40+
$this->loadUploadCollectionListener($config['upload_collection'], $container);
4141
$this->loadBootstrapCollectionTypes($container);
4242
}
4343

@@ -65,23 +65,23 @@ private function loadBootstrapCollectionTypes(ContainerBuilder $container)
6565
* @param ContainerBuilder $container
6666
* @throws \LogicException
6767
*/
68-
private function loadCollectionUploadListener(array $config, ContainerBuilder $container)
68+
private function loadUploadCollectionListener(array $config, ContainerBuilder $container)
6969
{
7070
if ($config['async_listener_enabled']) {
7171
if (!(array_key_exists('async_route_name', $config) && $routeName = $config['async_route_name'])) {
7272
throw new \LogicException('async_route_name must be defined when async_listener_enabled is true');
7373
}
7474

75-
$collectionUploadListenerDefinition = new Definition('%admingenerator.form.collection_upload_listener.class%');
75+
$collectionUploadListenerDefinition = new Definition('%admingenerator.form.upload_collection_listener.class%');
7676
$collectionUploadListenerDefinition->setArguments(array(
7777
new Reference($config['file_storage']),
7878
$routeName,
7979
new Reference('property_accessor')
8080
));
8181
$collectionUploadListenerDefinition->addTag('kernel.event_subscriber');
82-
$container->setDefinition('admingenerator.form.collection_upload_listener', $collectionUploadListenerDefinition);
82+
$container->setDefinition('admingenerator.form.upload_collection_listener', $collectionUploadListenerDefinition);
8383

84-
$container->getDefinition('admingenerator.form.extensions.type.collection_upload')->addMethodCall('setFileStorage', array(new Reference($config['file_storage'])));
84+
$container->getDefinition('admingenerator.form.extensions.type.upload_collection')->addMethodCall('setFileStorage', array(new Reference($config['file_storage'])));
8585
}
8686
}
8787
}

‎DependencyInjection/Configuration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function getConfigTreeBuilder()
3030
->booleanNode('use_form_resources')->defaultTrue()->end()
3131
->end()
3232
->end()
33-
->arrayNode('collection_upload')
33+
->arrayNode('upload_collection')
3434
->addDefaultsIfNotSet()
3535
->children()
3636
->booleanNode('async_listener_enabled')->defaultFalse()->end()

‎Form/EventListener/CollectionUploadSubscriber.php renamed to ‎Form/EventListener/UploadCollectionSubscriber.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313

1414
/**
1515
* @author Piotr Gołębiewski <[email protected]>
16+
* @author Stéphane Escandell <[email protected]>
1617
*/
17-
class CollectionUploadSubscriber implements EventSubscriberInterface
18+
class UploadCollectionSubscriber implements EventSubscriberInterface
1819
{
1920
/**
2021
* @var string Name of property holding collection

‎Form/Type/Select2HiddenType.php

-18
This file was deleted.

‎Form/Type/Select2Type.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function configureOptions(OptionsResolver $resolver)
8080

8181
$resolver
8282
->setDefaults(array(
83-
'hidden' => false,
83+
'hidden' => false, // TODO: what the aim of this option? I don't get a use case for an hidden select2 input...
8484
'configs' => $defaults,
8585
'transformer' => null,
8686
))

‎Form/Type/CollectionUploadType.php renamed to ‎Form/Type/UploadCollectionType.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33
namespace Admingenerator\FormExtensionsBundle\Form\Type;
44

5-
use Admingenerator\FormExtensionsBundle\Form\EventListener\CollectionUploadSubscriber;
5+
use Admingenerator\FormExtensionsBundle\Form\EventListener\UploadCollectionSubscriber;
66
use Admingenerator\FormExtensionsBundle\Storage\FileStorageInterface;
77
use Symfony\Component\Form\AbstractType;
88
use Symfony\Component\Form\FormBuilderInterface;
99
use Symfony\Component\Form\FormInterface;
1010
use Symfony\Component\Form\FormView;
1111
use Symfony\Component\OptionsResolver\OptionsResolver;
12-
use Symfony\Component\HttpFoundation\Session\SessionInterface;
1312

1413
/**
1514
* See `Resources/doc/collection-upload/overview.md` for documentation
1615
*
1716
* @author Piotr Gołębiewski <[email protected]>
17+
* @author Stéphane Escandell <[email protected]>
1818
*/
19-
class CollectionUploadType extends AbstractType
19+
class UploadCollectionType extends AbstractType
2020
{
2121
/**
2222
* @var FileStorageInterface
@@ -36,7 +36,7 @@ public function setFileStorage(FileStorageInterface $storage)
3636
*/
3737
public function buildForm(FormBuilderInterface $builder, array $options)
3838
{
39-
$builder->addEventSubscriber(new CollectionUploadSubscriber(
39+
$builder->addEventSubscriber(new UploadCollectionSubscriber(
4040
$builder->getName(),
4141
$options,
4242
$this->storage
@@ -196,14 +196,14 @@ public function configureOptions(OptionsResolver $resolver)
196196
*/
197197
public function getParent()
198198
{
199-
return 'collection';
199+
return 'Symfony\Component\Form\Extension\Core\Type\CollectionType';
200200
}
201201

202202
/**
203203
* {@inheritdoc}
204204
*/
205-
public function getName()
205+
public function getBlockPrefix()
206206
{
207-
return 's2a_collection_upload';
207+
return 's2a_upload_collection';
208208
}
209209
}

‎Resources/config/services.xml

+2-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<parameters>
8-
<parameter key="admingenerator.form.collection_upload_listener.class">Admingenerator\FormExtensionsBundle\EventListener\CollectionUploadListener</parameter>
8+
<parameter key="admingenerator.form.upload_collection_listener.class">Admingenerator\FormExtensionsBundle\EventListener\UploadCollectionListener</parameter>
99
</parameters>
1010

1111
<services>
@@ -16,7 +16,7 @@
1616
<tag name="form.type" />
1717
</service>
1818

19-
<service id="admingenerator.form.extensions.type.collection_upload" class="Admingenerator\FormExtensionsBundle\Form\Type\CollectionUploadType">
19+
<service id="admingenerator.form.extensions.type.upload_collection" class="Admingenerator\FormExtensionsBundle\Form\Type\UploadCollectionType">
2020
<tag name="form.type" />
2121
</service>
2222

@@ -75,10 +75,6 @@
7575
<tag name="form.type" />
7676
</service>
7777

78-
<service id="admingenerator.form.extensions.type.select2_hidden" class="Admingenerator\FormExtensionsBundle\Form\Type\Select2HiddenType">
79-
<tag name="form.type" />
80-
</service>
81-
8278
<service id="admingenerator.form.extensions.type.select2_locale" class="Admingenerator\FormExtensionsBundle\Form\Type\Select2LocaleType">
8379
<tag name="form.type" />
8480
</service>

‎Resources/translations/AdmingeneratorFormExtensions.de.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s2a_bootstrap_collection:
66
delete: Wollen Sie wirklich dieses Element löschen?
77
batchDelete: Wollen Sie wirklich alle ausgewählten Elemente löschen?
88

9-
s2a_collection_upload:
9+
s2a_upload_collection:
1010
file.add: "Dateien hinzufügen..."
1111
start: Hochladen beginnen
1212
error: Fehler

‎Resources/translations/AdmingeneratorFormExtensions.en.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s2a_bootstrap_collection:
66
delete: Are you sure you want to delete this element?
77
batchDelete: Are you sure you want to delete all selected elements?
88

9-
s2a_collection_upload:
9+
s2a_upload_collection:
1010
file.add: "Add files..."
1111
start: Start upload
1212
error: Error

‎Resources/translations/AdmingeneratorFormExtensions.es.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s2a_bootstrap_collection:
66
delete: ¿Estás seguro que quieres borrar este elemento?
77
batchDelete: ¿Estás seguro que quieres borrar todos los elementos seleccionados?
88

9-
s2a_collection_upload:
9+
s2a_upload_collection:
1010
file.add: "Añadir archivo..."
1111
start: Start upload
1212
error: Error

‎Resources/translations/AdmingeneratorFormExtensions.fr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s2a_bootstrap_collection:
66
delete: Êtes-vous sûr de vouloir retirer cet élément ?
77
batchDelete: Êtes-vous sûr de vouloir retirer tous ces éléments ?
88

9-
s2a_collection_upload:
9+
s2a_upload_collection:
1010
file.add: "Ajouter des fichiers..."
1111
start: Envoyer
1212
error: Erreur

‎Resources/translations/AdmingeneratorFormExtensions.it.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s2a_bootstrap_collection:
66
delete: Sei sicuro di voler cancellare questo elemento?
77
batchDelete: Sei sicuro di voler cancellare gli elementi selezionati?
88

9-
s2a_collection_upload:
9+
s2a_upload_collection:
1010
file.add: "Aggiungi file..."
1111
start: Start upload
1212
error: Errore

‎Resources/translations/AdmingeneratorFormExtensions.nb.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s2a_bootstrap_collection:
66
delete: Er du sikker på at du vil slette dette elementet?
77
batchDelete: Er du sikker på at du vil slette alle merkede elementer?
88

9-
s2a_collection_upload:
9+
s2a_upload_collection:
1010
file.add: "Legg til fil..."
1111
start: Start upload
1212
error: Feil

‎Resources/translations/AdmingeneratorFormExtensions.nl.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s2a_bootstrap_collection:
66
delete: Weet U zeker dat U dit element wilt verwijderen?
77
batchDelete: Weet U zeker dat U alle geselecteerde elementen wilt verwijderen?
88

9-
s2a_collection_upload:
9+
s2a_upload_collection:
1010
file.add: "Bestand toevoegen..."
1111
start: Start upload
1212
error: Fout

‎Resources/translations/AdmingeneratorFormExtensions.pl.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s2a_bootstrap_collection:
66
delete: Czy potwierdzasz usunięcie elementu?
77
batchDelete: Czy potwierdzasz usunięcie wszystkich zaznaczonych elementów?
88

9-
s2a_collection_upload:
9+
s2a_upload_collection:
1010
file.add: "Dodaj plik..."
1111
start: Wgraj
1212
error: Błąd

‎Resources/translations/AdmingeneratorFormExtensions.pt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s2a_bootstrap_collection:
66
delete: Confirma a eliminação deste elemento?
77
batchDelete: Confirma a eliminação de todos os elementos selecionados?
88

9-
s2a_collection_upload:
9+
s2a_upload_collection:
1010
file.add: "Adicionar ficheiro..."
1111
start: Start upload
1212
error: Erro

‎Resources/translations/AdmingeneratorFormExtensions.ru.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s2a_bootstrap_collection:
66
delete: "Вы уверены, что хотите удалить этот элемент?"
77
batchDelete: "Вы уверены, что хотите удалить все выбранные элементы?"
88

9-
s2a_collection_upload:
9+
s2a_upload_collection:
1010
file.add: "Добавить файл..."
1111
start: Start upload
1212
error: Ошибка

‎Resources/translations/AdmingeneratorFormExtensions.uk.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s2a_bootstrap_collection:
66
delete: "Ви впевнені, що хочете видалити обраний елемент?"
77
batchDelete: "Ви впевнені, що хочете видалити всі обрані елементи?"
88

9-
s2a_collection_upload:
9+
s2a_upload_collection:
1010
file.add: "Додати файл..."
1111
start: Start upload
1212
error: Помилка

‎Resources/views/.DS_Store

6 KB
Binary file not shown.

‎Resources/views/Form/CollectionUpload/presentation_table.html.twig renamed to ‎Resources/views/Form/UploadCollection/presentation_table.html.twig

File renamed without changes.

‎Resources/views/Form/CollectionUpload/stylesheet.html.twig renamed to ‎Resources/views/Form/UploadCollection/stylesheet.html.twig

File renamed without changes.

‎Resources/views/Form/CollectionUpload/template_download.html.twig renamed to ‎Resources/views/Form/UploadCollection/template_download.html.twig

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<td class="size"><span>{% raw %}{%=o.formatFileSize(file.size)%}{% endraw %}</span></td>
2121
<td class="error" colspan="2">
2222
<span class="label label-important">
23-
{{- 's2a_collection_upload.error'|trans({}, 'AdmingeneratorFormExtensions') -}}
23+
{{- 's2a_upload_collection.error'|trans({}, 'AdmingeneratorFormExtensions') -}}
2424
</span> {% raw %}{%=file.error%}{% endraw %}
2525
</td>
2626
{% raw %}
@@ -95,21 +95,21 @@
9595
{% endraw %}
9696
<button class="btn btn-warning remove">
9797
<i class="fa fa-trash-o"></i>
98-
<span> {{ 's2a_collection_upload.cancel'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
98+
<span> {{ 's2a_upload_collection.cancel'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
9999
</button>
100100
{% raw %}
101101
{% } else { %}
102102
{% endraw %}
103103
{% if displayDownloadButton %}
104104
<a class="btn btn-info" target="_blank" {% raw %}href="{%=file.url%}"{% endraw %}>
105105
<i class="fa fa-download"></i>
106-
<span> {{ 's2a_collection_upload.download'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
106+
<span> {{ 's2a_upload_collection.download'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
107107
</a>
108108
{% endif %}
109109
{% if allow_delete %}
110110
<button class="btn btn-danger delete">
111111
<i class="fa fa-trash-o"></i>
112-
<span> {{ 's2a_collection_upload.delete'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
112+
<span> {{ 's2a_upload_collection.delete'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
113113
</button>
114114
<span class="btn btn-toggle btn-link input-append">
115115
<input class="toggle" type="checkbox" name="delete" value="1">

‎Resources/views/Form/CollectionUpload/template_upload.html.twig renamed to ‎Resources/views/Form/UploadCollection/template_upload.html.twig

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{% endraw %}
1515
<td class="error" colspan="2">
1616
<span class="label label-important">
17-
{{- 's2a_collection_upload.error'|trans({}, 'AdmingeneratorFormExtensions') -}}
17+
{{- 's2a_upload_collection.error'|trans({}, 'AdmingeneratorFormExtensions') -}}
1818
</span> {% raw %}{%=file.error%}{% endraw %}
1919
</td>
2020
{% raw %}
@@ -32,12 +32,12 @@
3232
{% if not autoUpload and uploadRouteName is not empty %}
3333
<button class="btn btn-primary start">
3434
<i class="fa fa-fw fa-upload"></i>
35-
<span> {{ 's2a_collection_upload.start'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
35+
<span> {{ 's2a_upload_collection.start'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
3636
</button>
3737
{% endif %}
3838
<button class="btn btn-warning cancel"{% if not autoUpload and uploadRouteName is empty %}style="visibility:hidden;"{% endif %}>
3939
<i class="fa fa-fw fa-ban"></i>
40-
<span> {{ 's2a_collection_upload.cancel'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
40+
<span> {{ 's2a_upload_collection.cancel'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
4141
</button>
4242
</div>
4343
{% raw %}

‎Resources/views/Form/form_css.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
{% block s2a_collection_upload_css %}
1414
{% spaceless %}
15-
{% include "AdmingeneratorFormExtensionsBundle:Form/CollectionUpload:stylesheet.html.twig" %}
15+
{% include "AdmingeneratorFormExtensionsBundle:Form/UploadCollection:stylesheet.html.twig" %}
1616
{% endspaceless %}
1717
{% endblock s2a_collection_upload_css %}
1818

0 commit comments

Comments
 (0)