about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authornullkal <nullkal@nil.nu>2017-10-27 23:11:30 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-10-27 16:11:30 +0200
commit781105293cf129c84ef0b91ec8cd27b7127cf951 (patch)
tree719dbf46e7aa62a8fc552f3c1f91d4a6b3e0e658 /app/controllers
parent0cb329f63a292598ef9ed1af6b8f8b56658e7984 (diff)
Feature: Unlisted custom emojis (#5485)
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/custom_emojis_controller.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb
index 5d9144be7..cbd7abe95 100644
--- a/app/controllers/admin/custom_emojis_controller.rb
+++ b/app/controllers/admin/custom_emojis_controller.rb
@@ -22,6 +22,14 @@ module Admin
       end
     end
 
+    def update
+      if @custom_emoji.update(resource_params)
+        redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.updated_msg')
+      else
+        redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.update_failed_msg')
+      end
+    end
+
     def destroy
       @custom_emoji.destroy
       redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.destroyed_msg')
@@ -56,7 +64,7 @@ module Admin
     end
 
     def resource_params
-      params.require(:custom_emoji).permit(:shortcode, :image)
+      params.require(:custom_emoji).permit(:shortcode, :image, :visible_in_picker)
     end
 
     def filtered_custom_emojis