about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-10-27 09:45:25 -0500
committerDavid Yip <yipdw@member.fsf.org>2017-10-27 09:45:25 -0500
commit870d71b78be74b7fab4892a79a87aff39b1e2726 (patch)
tree0628116973b67c573509f8affe50cc3d6c9a6f4f /app/views
parent656f5b6f87f2dcb80644edbedc4d2330eb5bee8d (diff)
parent781105293cf129c84ef0b91ec8cd27b7127cf951 (diff)
Merge branch 'master' into gs-master
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/custom_emojis/_custom_emoji.html.haml7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/views/admin/custom_emojis/_custom_emoji.html.haml b/app/views/admin/custom_emojis/_custom_emoji.html.haml
index 1fa64908c..399d13bbd 100644
--- a/app/views/admin/custom_emojis/_custom_emoji.html.haml
+++ b/app/views/admin/custom_emojis/_custom_emoji.html.haml
@@ -9,7 +9,12 @@
     - else
       = custom_emoji.domain
   %td
-    - unless custom_emoji.local?
+    - if custom_emoji.local?
+      - if custom_emoji.visible_in_picker
+        = table_link_to 'eye', t('admin.custom_emojis.listed'), admin_custom_emoji_path(custom_emoji, custom_emoji: { visible_in_picker: false }), method: :patch
+      - else
+        = table_link_to 'eye-slash', t('admin.custom_emojis.unlisted'), admin_custom_emoji_path(custom_emoji, custom_emoji: { visible_in_picker: true }), method: :patch
+    - else
       = table_link_to 'copy', t('admin.custom_emojis.copy'), copy_admin_custom_emoji_path(custom_emoji, page: params[:page]), method: :post
   %td
     - if custom_emoji.disabled?