maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

restore mandatory field on domain-formfields; add translated require message and correct error-placement of the message

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-01-12 15:16:42 +01:00
parent b52d6df777
commit e3f02879cf
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/formfields/admin/domains/formfield.domains_add.php
View File

@@ -140,7 +140,8 @@ return [
'type' => 'checkbox', 'type' => 'checkbox',
'values' => $ipsandports, 'values' => $ipsandports,
'value' => explode(',', Settings::Get('system.defaultip')), 'value' => explode(',', Settings::Get('system.defaultip')),
'is_array' => 1 'is_array' => 1,
'mandatory' => true
], ],
'selectserveralias' => [ 'selectserveralias' => [
'label' => lng('admin.selectserveralias'), 'label' => lng('admin.selectserveralias'),

3
lib/formfields/admin/domains/formfield.domains_edit.php
View File

@@ -154,7 +154,8 @@ return [
'type' => 'checkbox', 'type' => 'checkbox',
'values' => $ipsandports, 'values' => $ipsandports,
'value' => $usedips, 'value' => $usedips,
'is_array' => 1 'is_array' => 1,
'mandatory' => true
], ],
'selectserveralias' => [ 'selectserveralias' => [
'label' => lng('admin.selectserveralias'), 'label' => lng('admin.selectserveralias'),

2
templates/Froxlor/form/form.html.twig
View File

@@ -50,7 +50,7 @@
</form> </form>
{# add translation for custom validations #} {# add translation for custom validations #}
{% if form_data.id is defined and form_data.id in ['customer_add', 'customer_edit'] %} {% if form_data.id is defined and form_data.id in ['customer_add', 'customer_edit', 'domain_add', 'domain_edit'] %}
<script>$(function() { $.extend($.validator.messages, {required: "{{ lng('error.requiredfield') }}"}) });</script> <script>$(function() { $.extend($.validator.messages, {required: "{{ lng('error.requiredfield') }}"}) });</script>
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}

3
templates/Froxlor/src/js/components/validation.js
View File

@@ -29,6 +29,9 @@ $(document).ready(function () {
minlength: 1 minlength: 1
} }
}, },
errorPlacement: function(error, element) {
$(error).prependTo($(element).parent().parent());
}
}); });
}); });
}); });