From 058101b9414b331ec87c6d32c316b4301054415c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=93teris=20Caune?= <cuu508@gmail.com>
Date: Fri, 14 Aug 2015 12:15:49 +0300
Subject: [PATCH] Can remove channels

---
 hc/front/urls.py                       |  3 +-
 hc/front/views.py                      | 16 ++++++++++-
 static/css/channels.css                |  8 ++++++
 static/js/channels.js                  | 12 +++++++-
 templates/front/channels.html          | 38 +++++++++++++++++++++++++-
 templates/front/my_checks_desktop.html |  2 +-
 6 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/hc/front/urls.py b/hc/front/urls.py
index 623bf5af..b3b58a97 100644
--- a/hc/front/urls.py
+++ b/hc/front/urls.py
@@ -8,7 +8,7 @@ urlpatterns = [
     url(r'^checks/([\w-]+)/name/$',     views.update_name, name="hc-update-name"),
     url(r'^checks/([\w-]+)/timeout/$',  views.update_timeout, name="hc-update-timeout"),
     url(r'^checks/([\w-]+)/email/$',    views.email_preview),
-    url(r'^checks/([\w-]+)/remove/$',   views.remove, name="hc-remove-check"),
+    url(r'^checks/([\w-]+)/remove/$',   views.remove_check, name="hc-remove-check"),
     url(r'^checks/([\w-]+)/log/$',      views.log, name="hc-log"),
     url(r'^pricing/$',                  views.pricing, name="hc-pricing"),
     url(r'^docs/$',                     views.docs, name="hc-docs"),
@@ -16,6 +16,7 @@ urlpatterns = [
     url(r'^channels/$',                 views.channels, name="hc-channels"),
     url(r'^channels/add/$',             views.add_channel, name="hc-add-channel"),
     url(r'^channels/([\w-]+)/checks/$', views.channel_checks, name="hc-channel-checks"),
+    url(r'^channels/([\w-]+)/remove/$', views.remove_channel, name="hc-remove-channel"),
     url(r'^channels/([\w-]+)/verify/([\w-]+)/$',
         views.verify_email, name="hc-verify-email"),
 
diff --git a/hc/front/views.py b/hc/front/views.py
index a4c9f860..4c5ceae3 100644
--- a/hc/front/views.py
+++ b/hc/front/views.py
@@ -144,7 +144,7 @@ def email_preview(request, code):
 
 @login_required
 @uuid_or_400
-def remove(request, code):
+def remove_check(request, code):
     assert request.method == "POST"
 
     check = Check.objects.get(code=code)
@@ -251,3 +251,17 @@ def verify_email(request, code, token):
         return render(request, "front/verify_email_success.html")
 
     return render(request, "bad_link.html")
+
+
+@login_required
+@uuid_or_400
+def remove_channel(request, code):
+    assert request.method == "POST"
+
+    channel = Channel.objects.get(code=code)
+    if channel.user != request.user:
+        return HttpResponseForbidden()
+
+    channel.delete()
+
+    return redirect("hc-channels")
diff --git a/static/css/channels.css b/static/css/channels.css
index 79011c4b..228d3140 100644
--- a/static/css/channels.css
+++ b/static/css/channels.css
@@ -67,3 +67,11 @@ table.channels-table > tbody > tr > th {
 .channel-row:hover .edit-checks {
     border: 1px dotted #AAA;
 }
+
+.channel-remove {
+    visibility: hidden;
+}
+
+.channel-row:hover .channel-remove {
+    visibility: visible;
+}
\ No newline at end of file
diff --git a/static/js/channels.js b/static/js/channels.js
index 428183f9..8a39f72c 100644
--- a/static/js/channels.js
+++ b/static/js/channels.js
@@ -26,7 +26,6 @@ $(function() {
         return false;
     });
 
-
     var $cm = $("#checks-modal");
     $cm.on("click", "#toggle-all", function() {
         var value = $(this).prop("checked");
@@ -35,4 +34,15 @@ $(function() {
 
     });
 
+    $(".channel-remove").click(function() {
+        var $this = $(this);
+
+        $("#remove-channel-form").attr("action", $this.data("url"));
+        $(".remove-channel-name").text($this.data("name"));
+        $('#remove-channel-modal').modal("show");
+
+        return false;
+    });
+
+
 });
\ No newline at end of file
diff --git a/templates/front/channels.html b/templates/front/channels.html
index b3e8fc10..703bf295 100644
--- a/templates/front/channels.html
+++ b/templates/front/channels.html
@@ -9,6 +9,7 @@
     <div class="col-sm-12">
     <h1>Notification Channels</h1>
     <table class="table channels-table">
+        {% if channels %}
         <tr>
             <th>Type</th>
             <th>Value</th>
@@ -41,11 +42,21 @@
                     {{ ch.checks.count }} of {{ num_checks }}
                 </a>
             </td>
+            <td>
+                <button
+                    data-name="{{ ch.value }}"
+                    data-url="{% url 'hc-remove-channel' ch.code %}"
+                    class="btn btn-sm btn-default channel-remove"
+                    type="button">
+                    <span class="glyphicon glyphicon-trash"></span>
+                </button>
+            </td>
             <td>
 
             </td>
         </tr>
         {% endfor %}
+        {% endif %}
         <tr>
             <th colspan="2" class="channels-add-title">
                 Add Notification Channel
@@ -71,7 +82,6 @@
                 <button type="submit" class="btn btn-success">Add</button>
             </td>
             <td>
-
             </td>
             </form>
         </tr>
@@ -109,6 +119,32 @@
     </div>
 </div>
 
+<div id="remove-channel-modal" class="modal">
+    <div class="modal-dialog">
+        <form id="remove-channel-form" method="post">
+            {% csrf_token %}
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">&times;</span></button>
+                    <h4 class="remove-check-title">Remove Channel <span class="remove-channel-name"></h4>
+                </div>
+                <div class="modal-body">
+                    <p>You are about to remove channel
+                        <strong class="remove-channel-name">---</strong>.
+                    </p>
+                    <p>Once it's gone it's gone. But, if you change your
+                    mind later, you can create a similar channel again.</p>
+                    <p>Do you want to continue?</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-danger">Remove</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+
 {% endblock %}
 
 {% block scripts %}
diff --git a/templates/front/my_checks_desktop.html b/templates/front/my_checks_desktop.html
index c4de10be..5e7715af 100644
--- a/templates/front/my_checks_desktop.html
+++ b/templates/front/my_checks_desktop.html
@@ -79,7 +79,7 @@
                     <li role="separator" class="divider"></li>
                     <li>
                         <a href="#" class="check-menu-remove"
-                            data-name="{{ check.name|default:check.code }}"
+                            data-name="{{ check.name_then_code }}"
                             data-url="{% url 'hc-remove-check' check.code %}">
                             <span class="glyphicon glyphicon-trash"></span>
                             Remove