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.

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

[GeneratorBundle] Fix error when generating pagepart with images #356

Merged
merged 1 commit into from Apr 22, 2015

Conversation

Projects
None yet
3 participants
@arneruy
Copy link
Contributor

arneruy commented Apr 21, 2015

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Fixed tickets #353

Pageparts containing images can now be generated without errors.

@@ -31,13 +31,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
{% endif %}
{% if field.mediaType is defined and field.mediaType != 'none' %} 'mediatype' => '{{ field.mediaType }}',
'constraints' => array(new Assert\Media(array(
'mimeTypes' => array({% for type in field.mimeTypes %}'{{ type }}',{% endfor %}),
'mimeTypes' => array({% for type in field.mimeTypes %}'{{ type }}',{% endfor %}),

This comment has been minimized.

@krispypen

krispypen Apr 21, 2015

Member

can you remove this file from your PR? never use "git add ."

@arneruy arneruy force-pushed the arneruy:issue_353 branch from 94e1610 to edd710b Apr 21, 2015

@roderik

This comment has been minimized.

Copy link
Contributor

roderik commented Apr 21, 2015

@arne zet uw gitconfig eens juist?

@arneruy arneruy force-pushed the arneruy:issue_353 branch 3 times, most recently from d605618 to f83965b Apr 22, 2015

Fix error when generating pagepart
Fix error when generating pagepart

Revert "Fix error when generating pagepart"

This reverts commit edd710b.

Fix error when generating pagepart

Fix error when generating pagepart
@krispypen

This comment has been minimized.

Copy link
Member

krispypen commented Apr 22, 2015

@roderik 👍

@roderik roderik added this to the 3.1.1 milestone Apr 22, 2015

roderik pushed a commit that referenced this pull request Apr 22, 2015

Roderik van der Veer
Merge pull request #356 from arneruy/issue_353
[GeneratorBundle] Fix error when generating pagepart with images

@roderik roderik merged commit f8a891e into Kunstmaan:master Apr 22, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment