From 4f694f495c840907aa93bec473911fd11b5bf348 Mon Sep 17 00:00:00 2001
From: "Philipp A. Mohrenweiser" <phiamo@googlemail.com>
Date: Tue, 9 May 2017 19:21:26 +0200
Subject: [PATCH 1/2] Implement disabled feature from symfony2 forms

Dont show the edit button if symfony2 form says field is disabled.
maybe we should exclude also js etc?
---
 Resources/views/Form/fields.html.twig | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig
index aec5ade2..3e4f8b7c 100644
--- a/Resources/views/Form/fields.html.twig
+++ b/Resources/views/Form/fields.html.twig
@@ -13,11 +13,13 @@
             </div>
         </div>
         <div class="image_preview select-image-button" id="image_preview_{{ form[name].vars.id }}" style="z-index: 1050">
-            <div class="image_edit_button">
-                <span class="btn btn-success select-image-button">
-                    <i class="glyphicon glyphicon-edit glyphicon-white"></i> {% trans %}Edit{% endtrans %}
-                </span>
-            </div>
+            {% if not disabled %}
+                <div class="image_edit_button">
+                    <span class="btn btn-success select-image-button">
+                        <i class="glyphicon glyphicon-edit glyphicon-white"></i> {% trans %}Edit{% endtrans %}
+                    </span>
+                </div>
+            {% endif %}
             <div id="image_preview_image_{{form[name].vars.id}}">
                 {% if not options.fieldImage %}
                     {% if form[name].vars.value %}

From 0fae6f27057247c3fc16f27ff75ca4caf28d7e3c Mon Sep 17 00:00:00 2001
From: "Philipp A. Mohrenweiser" <phiamo@googlemail.com>
Date: Wed, 10 May 2017 22:11:17 +0200
Subject: [PATCH 2/2] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index aab1fab6..1b3fdf83 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.3.0-dev"
         }
     }
 }