diff --git a/hc/front/forms.py b/hc/front/forms.py
index 3308787b..554ec5ee 100644
--- a/hc/front/forms.py
+++ b/hc/front/forms.py
@@ -67,16 +67,16 @@ class AddWebhookForm(forms.Form):
post_data = forms.CharField(max_length=1000, required=False)
def __init__(self, *args, **kwargs):
- self.headers = {}
- if all(k in kwargs for k in ("header_keys", "header_values")):
- header_keys = kwargs.pop("header_keys")
- header_values = kwargs.pop("header_values")
+ super(AddWebhookForm, self).__init__(*args, **kwargs)
- for i, (key, val) in enumerate(zip(header_keys, header_values)):
+ self.headers = {}
+ if "header_key[]" in self.data and "header_value[]" in self.data:
+ keys = self.data.getlist("header_key[]")
+ values = self.data.getlist("header_value[]")
+ for key, value in zip(keys, values):
if key:
- self.headers[key] = val
+ self.headers[key] = value
- super(AddWebhookForm, self).__init__(*args, **kwargs)
def get_value(self):
val = dict(self.cleaned_data)
diff --git a/hc/front/views.py b/hc/front/views.py
index 972ef126..22853577 100644
--- a/hc/front/views.py
+++ b/hc/front/views.py
@@ -437,10 +437,7 @@ def add_email(request):
@login_required
def add_webhook(request):
if request.method == "POST":
- header_keys = request.POST.getlist('header_key[]')
- header_values = request.POST.getlist('header_value[]')
- form = AddWebhookForm(request.POST or None,
- header_keys=header_keys, header_values=header_values)
+ form = AddWebhookForm(request.POST)
if form.is_valid():
channel = Channel(user=request.team.user, kind="webhook")
channel.value = form.get_value()
diff --git a/static/css/channels.css b/static/css/channels.css
index 0d2a0d5c..d4e5a364 100644
--- a/static/css/channels.css
+++ b/static/css/channels.css
@@ -191,4 +191,14 @@ table.channels-table > tbody > tr > th {
.page-channels .icon-delete {
font-size: 16px;
+}
+
+/* Add Webhook */
+
+.webhook-header input.form-control {
+ width: 300px;
+}
+
+.webhook-header {
+ margin-bottom: 4px;
}
\ No newline at end of file
diff --git a/static/js/webhook.js b/static/js/webhook.js
index 9b22b380..2e7cc9f2 100644
--- a/static/js/webhook.js
+++ b/static/js/webhook.js
@@ -1,29 +1,25 @@
$(function() {
- $(".webhook_header_btn:first").addClass("btn-info").text("+")
- $(".webhook_header_btn:not(:first)").addClass("btn-danger").text("X")
+ function haveBlankHeaderForm() {
+ return $("#webhook-headers .webhook-header").filter(function() {
+ var key = $(".key", this).val();
+ var value = $(".value", this).val();
+ return !key && !value;
+ }).length;
+ }
- $("#webhook_headers").on("click", ".webhook_header_btn.btn-danger", function(e) {
- e.preventDefault();
- $(this).closest("div.row").remove();
- });
+ function ensureBlankHeaderForm() {
+ if (!haveBlankHeaderForm()) {
+ var tmpl = $("#header-template").html();
+ $("#webhook-headers").append(tmpl);
+ }
+ }
- $("#webhook_headers").on("click", ".webhook_header_btn.btn-info", function(e) {
+ $("#webhook-headers").on("click", "button", function(e) {
e.preventDefault();
+ $(this).closest(".webhook-header").remove();
+ ensureBlankHeaderForm();
+ })
- // Add new header form
- $("#webhook_headers").append(
-'\
-
\
- \
-
\
-
\
-
\
- \
- \
- \
- \
-
\
-
\
-