From ae3fc1f2a6c11f70ced346afcc286b4ff25b1b24 Mon Sep 17 00:00:00 2001
From: Bertrand Bordage <bordage.bertrand@gmail.com>
Date: Fri, 15 Dec 2017 11:27:02 +0100
Subject: [PATCH] Fixes disabled lock button.

---
 .../static_src/wagtailadmin/scss/components/_formatters.scss  | 4 ++++
 wagtail/admin/templates/wagtailadmin/pages/_lock_switch.html  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/wagtail/admin/static_src/wagtailadmin/scss/components/_formatters.scss b/wagtail/admin/static_src/wagtailadmin/scss/components/_formatters.scss
index 34bf2b0d3..e0f711fa5 100644
--- a/wagtail/admin/static_src/wagtailadmin/scss/components/_formatters.scss
+++ b/wagtail/admin/static_src/wagtailadmin/scss/components/_formatters.scss
@@ -108,6 +108,10 @@
         border: 1px solid $color-grey-2;
         background: #fff;
     }
+
+    &.disabled {
+        pointer-events: none;
+    }
 }
 
 button.status-tag:hover,
diff --git a/wagtail/admin/templates/wagtailadmin/pages/_lock_switch.html b/wagtail/admin/templates/wagtailadmin/pages/_lock_switch.html
index 088a75b67..7f21a5ef4 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/_lock_switch.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/_lock_switch.html
@@ -9,7 +9,7 @@
 
     {% csrf_token %}
     <input type="hidden" name="next" value="{% url 'wagtailadmin_pages:edit' page.id %}" />
-    <button type="submit" class="status-tag {{ page.locked|yesno:'primary,secondary' }}{% if page_perms.can_lock %} disabled{% endif %}">
+    <button type="submit" class="status-tag {{ page.locked|yesno:'primary,secondary' }}{% if not page_perms.can_lock %} disabled{% endif %}">
         {% if page.locked %}
             {% trans 'Locked' %}
         {% else %}