From 781105293cf129c84ef0b91ec8cd27b7127cf951 Mon Sep 17 00:00:00 2001
From: nullkal <nullkal@nil.nu>
Date: Fri, 27 Oct 2017 23:11:30 +0900
Subject: Feature: Unlisted custom emojis (#5485)
---
app/controllers/admin/custom_emojis_controller.rb | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
(limited to 'app/controllers')
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
--
cgit