diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-02-08 15:39:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-08 15:39:51 +0100 |
commit | a86c3f1759a3c0ecbf095888789c2a08d71b5c09 (patch) | |
tree | 540737e663406e922091a5e177b1105fc5a96212 | |
parent | 18460b2d79125d0252e7fe71e1ae84d5ef4f040a (diff) | |
parent | baa5ee2d4292460425ca7f6572425f1fb1100d9d (diff) | |
download | wallabag-a86c3f1759a3c0ecbf095888789c2a08d71b5c09.tar.gz wallabag-a86c3f1759a3c0ecbf095888789c2a08d71b5c09.tar.zst wallabag-a86c3f1759a3c0ecbf095888789c2a08d71b5c09.zip |
Merge pull request #3879 from wallabag/fix/url-default-protocol
Force default_protocol to generate an url input
-rw-r--r-- | src/Wallabag/ApiBundle/Form/Type/ClientType.php | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/EditEntryType.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/NewEntryType.php | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/Wallabag/ApiBundle/Form/Type/ClientType.php b/src/Wallabag/ApiBundle/Form/Type/ClientType.php index fc22538f..14dc5c44 100644 --- a/src/Wallabag/ApiBundle/Form/Type/ClientType.php +++ b/src/Wallabag/ApiBundle/Form/Type/ClientType.php | |||
@@ -20,6 +20,7 @@ class ClientType extends AbstractType | |||
20 | 'required' => false, | 20 | 'required' => false, |
21 | 'label' => 'developer.client.form.redirect_uris_label', | 21 | 'label' => 'developer.client.form.redirect_uris_label', |
22 | 'property_path' => 'redirectUris', | 22 | 'property_path' => 'redirectUris', |
23 | 'default_protocol' => null, | ||
23 | ]) | 24 | ]) |
24 | ->add('save', SubmitType::class, ['label' => 'developer.client.form.save_label']) | 25 | ->add('save', SubmitType::class, ['label' => 'developer.client.form.save_label']) |
25 | ; | 26 | ; |
diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php index 08355928..2fc4c204 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php | |||
@@ -22,11 +22,13 @@ class EditEntryType extends AbstractType | |||
22 | 'disabled' => true, | 22 | 'disabled' => true, |
23 | 'required' => false, | 23 | 'required' => false, |
24 | 'label' => 'entry.edit.url_label', | 24 | 'label' => 'entry.edit.url_label', |
25 | 'default_protocol' => null, | ||
25 | ]) | 26 | ]) |
26 | ->add('origin_url', UrlType::class, [ | 27 | ->add('origin_url', UrlType::class, [ |
27 | 'required' => false, | 28 | 'required' => false, |
28 | 'property_path' => 'originUrl', | 29 | 'property_path' => 'originUrl', |
29 | 'label' => 'entry.edit.origin_url_label', | 30 | 'label' => 'entry.edit.origin_url_label', |
31 | 'default_protocol' => null, | ||
30 | ]) | 32 | ]) |
31 | ->add('save', SubmitType::class, [ | 33 | ->add('save', SubmitType::class, [ |
32 | 'label' => 'entry.edit.save_label', | 34 | 'label' => 'entry.edit.save_label', |
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php b/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php index 7d74fee3..7af1e589 100644 --- a/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php +++ b/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php | |||
@@ -15,6 +15,7 @@ class NewEntryType extends AbstractType | |||
15 | ->add('url', UrlType::class, [ | 15 | ->add('url', UrlType::class, [ |
16 | 'required' => true, | 16 | 'required' => true, |
17 | 'label' => 'entry.new.form_new.url_label', | 17 | 'label' => 'entry.new.form_new.url_label', |
18 | 'default_protocol' => null, | ||
18 | ]) | 19 | ]) |
19 | ; | 20 | ; |
20 | } | 21 | } |