1
0
مراية لـ https://github.com/postalserver/postal.git تم المزامنة 2025-12-01 05:43:04 +00:00

remove types from ip pools

closes #24
هذا الالتزام موجود في:
Adam Cooke
2017-04-28 16:40:53 +01:00
الأصل 88974cee85
التزام 698b580db4
10 ملفات معدلة مع 14 إضافات و29 حذوفات

عرض الملف

@@ -24,7 +24,7 @@
.fieldSet__field
= f.label :ip_pool_id, "IP Pool", :class => 'fieldSet__label'
.fieldSet__input
= f.collection_select :ip_pool_id, organization.ip_pools.includes(:ip_addresses).order("`default` desc, name asc"), :id, :description, {}, :class => 'input input--select'
= f.collection_select :ip_pool_id, organization.ip_pools.includes(:ip_addresses).order("`default` desc, name asc"), :id, :name, {}, :class => 'input input--select'
%p.fieldSet__text
This is the IP pool that this message should be delivered from.

عرض الملف

@@ -59,7 +59,7 @@
%dl.ipPoolRuleList__condition
%dt Will be sent using:
%dd= ip_pool_rule.ip_pool.description
%dd= ip_pool_rule.ip_pool.name
- if @server
%p.ipPoolRuleListDefault.u-margin All mail that doesn't match a rule above will be sent using #{@server.ip_pool.description}.
%p.ipPoolRuleListDefault.u-margin All mail that doesn't match a rule above will be sent using #{@server.ip_pool.name}.
%p.u-center= link_to "Add another rule", [:new, organization, @server, :ip_pool_rule], :class => "button button--positive"