Merge "Add Reject option to Firewall Rules"
This commit is contained in:
commit
b9e8dc1e30
@ -42,7 +42,8 @@ class UpdateRule(forms.SelfHandlingForm):
|
||||
help_text=_('Protocol for the firewall rule'))
|
||||
action = forms.ChoiceField(
|
||||
label=_("Action"), required=False,
|
||||
choices=[('ALLOW', _('ALLOW')), ('DENY', _('DENY'))],
|
||||
choices=[('ALLOW', _('ALLOW')), ('DENY', _('DENY')),
|
||||
('REJECT', _('REJECT'))],
|
||||
help_text=_('Action for the firewall rule'))
|
||||
source_ip_address = forms.IPField(
|
||||
label=_("Source IP Address/Subnet"),
|
||||
|
@ -286,6 +286,7 @@ class RulesTable(tables.DataTable):
|
||||
ACTION_DISPLAY_CHOICES = (
|
||||
("Allow", pgettext_lazy("Action Name of a Firewall Rule", u"ALLOW")),
|
||||
("Deny", pgettext_lazy("Action Name of a Firewall Rule", u"DENY")),
|
||||
("Reject", pgettext_lazy("Action Name of a Firewall Rule", u"REJECT")),
|
||||
)
|
||||
name = tables.Column("name_or_id",
|
||||
verbose_name=_("Name"),
|
||||
|
@ -43,7 +43,8 @@ class AddRuleAction(workflows.Action):
|
||||
action = forms.ChoiceField(
|
||||
label=_("Action"),
|
||||
choices=[('allow', _('ALLOW')),
|
||||
('deny', _('DENY'))],)
|
||||
('deny', _('DENY')),
|
||||
('reject', _('REJECT'))],)
|
||||
source_ip_address = forms.IPField(
|
||||
label=_("Source IP Address/Subnet"),
|
||||
version=forms.IPv4 | forms.IPv6,
|
||||
|
Loading…
Reference in New Issue
Block a user