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

Attribute choices management #2765

Merged
merged 1 commit into from
May 23, 2015
Merged

Attribute choices management #2765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 17 additions & 21 deletions src/Sylius/Bundle/AttributeBundle/Form/EventListener/BuildAttributeFormChoicesListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,28 +95,24 @@ public function buildChoices(FormEvent $event)
return;
}

$type = $attribute->getType();
$data = null;
$config = $attribute->getConfiguration();

if (null === $type || AttributeTypes::CHOICE === $type) {
$data = null;
$config = $attribute->getConfiguration();

if (!empty($config['choices'])) {
$data = $config['choices'];
}

$event->getForm()->add(
$this->factory->createNamed('choices', 'collection', null, array(
'label' => 'sylius.form.attribute.choices',
'type' => 'text',
'allow_add' => true,
'allow_delete' => true,
'by_reference' => false,
'auto_initialize' => false,
'mapped' => false,
'data' => $data,
)
));
if (!empty($config['choices'])) {
$data = $config['choices'];
}

$event->getForm()->add(
$this->factory->createNamed('choices', 'collection', null, array(
'label' => 'sylius.form.attribute.choices',
'type' => 'text',
'allow_add' => true,
'allow_delete' => true,
'by_reference' => false,
'auto_initialize' => false,
'mapped' => false,
'data' => $data,
)
));
}
}
55 changes: 0 additions & 55 deletions .../Bundle/AttributeBundle/spec/Form/EventListener/BuildAttributeFormChoicesListenerSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,38 +54,6 @@ function it_does_no_not_build_choices_collection_for_null(
$this->buildChoices($event);
}

function it_builds_choices_collection_for_new_object_without_type(
FormEvent $event,
Form $form,
AttributeInterface $attribute,
Form $collectionField,
$formFactory
) {
$event->getData()->willReturn($attribute);
$event->getForm()->willReturn($form);

$attribute->getType()->willReturn(null);
$attribute->getConfiguration()->willReturn(array());

$formFactory
->createNamed('choices', 'collection', null, array(
'label' => 'sylius.form.attribute.choices',
'type' => 'text',
'allow_add' => true,
'allow_delete' => true,
'by_reference' => false,
'auto_initialize' => false,
'mapped' => false,
'data' => null,
))
->willReturn($collectionField)
->shouldBeCalled()
;
$form->add($collectionField)->shouldBeCalled()->willReturn($form);

$this->buildChoices($event);
}

function it_builds_choices_collection_for_choice_attribute(
FormEvent $event,
Form $form,
Expand All @@ -96,7 +64,6 @@ function it_builds_choices_collection_for_choice_attribute(
$event->getData()->willReturn($attribute);
$event->getForm()->willReturn($form);

$attribute->getType()->willReturn(AttributeTypes::CHOICE);
$attribute->getConfiguration()->willReturn(array());

$formFactory
Expand All @@ -118,28 +85,6 @@ function it_builds_choices_collection_for_choice_attribute(
$this->buildChoices($event);
}

function it_does_not_build_choices_collection_for_other_than_choice_attribute_types(
FormEvent $event,
Form $form,
AttributeInterface $attribute,
Form $collectionField,
$formFactory
) {
$attribute->getType()->willReturn(AttributeTypes::TEXT);

$event->getData()->willReturn($attribute);
$event->getForm()->willReturn($form);

$formFactory
->createNamed('choices', 'collection', null, Argument::any())
->willReturn($collectionField)
->shouldNotBeCalled()
;
$form->add(Argument::any())->shouldNotBeCalled();

$this->buildChoices($event);
}

function it_build_configuration_collection_type(
FormEvent $event,
Form $form,
Expand Down
51 changes: 19 additions & 32 deletions src/Sylius/Bundle/WebBundle/Resources/public/js/sylius-attribute-choices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,27 @@
(function ( $ ) {
'use strict';

$(document).ready(function() {
toogleChoices($('#sylius_product_attribute_type').val());
$('#sylius_product_attribute_type').change(function (e) {
toogleChoices($(this).val());
});
$('.delete-link').each(function () {
var removeLink = $(this);
removeLink.on('click', function(e) {
e.preventDefault();
var attributeController = {
choicesContainer: $('#sylius_form_choice_container'),
choicesElement: $('#sylius_product_attribute_type'),

removeLink.parent().parent().remove();
});
});
$('a[data-collection-button="add"]').on('click', function (e) {
e.preventDefault();
listen: function()
{
this.choicesElement.change($.proxy(this.toogleChoices, this));
this.toogleChoices();
},

var collectionContainer = $('#' + $(this).data('collection'));
var item = $('#' + $(this).data('collection') + ' .control-group:last-child');
var removeLink = $('<a class="btn btn-danger sylius_product_attribute_choices_' + (collectionContainer.children().length - 1) + '_delete" href="#"><i class="icon-trash"></i></a>');
removeLink.on('click', function(e) {
e.preventDefault();
toogleChoices: function()
{
if ('choice' === this.choicesElement.val()) {
this.choicesContainer.show();
} else {
this.choicesContainer.hide();
}
}
};

item.remove();
});
item.find('.controls').append(removeLink);
});
$(document).ready(function() {
attributeController.listen();
});

function toogleChoices(value)
{
if (value === 'choice') {
$('.attribute-choices-container').show();
} else {
$('.attribute-choices-container').hide();
}
}
})( jQuery );
8 changes: 5 additions & 3 deletions src/Sylius/Bundle/WebBundle/Resources/views/Backend/ProductAttribute/_form.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
{{ form_row(form.name, {'attr': {'class': 'input-lg'}}) }}
{{ form_row(form.translations, {'attr': {'class': 'input-lg'}}) }}
{{ form_row(form.type, {'attr': {'class': 'input-lg'}}) }}
{% if form.choices is defined %}
{{ form_row(form.choices) }}
{% endif %}
<div id="sylius_form_choice_container" class="hide">
{% if form.choices is defined %}
{{ form_row(form.choices) }}
{% endif %}
</div>
</fieldset>

{{ form_widget(form._token) }}