diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-16 01:29:02 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-10-16 01:29:02 -0500 |
| commit | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (patch) | |
| tree | 4bb60f4493fb70cada728a373f74c18b87e8f95d /app/controllers/admin/custom_emojis_controller.rb | |
| parent | f72ad67a3967230afd63a9e2d84a2a69331c4787 (diff) | |
| parent | 894da3dcca781e27ce9c5130f1021526ac8a6887 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/controllers/admin/custom_emojis_controller.rb')
| -rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index ca81f3255..5cce5bce4 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -31,10 +31,12 @@ module Admin emoji = CustomEmoji.new(domain: nil, shortcode: @custom_emoji.shortcode, image: @custom_emoji.image) if emoji.save - redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.copied_msg') + flash[:notice] = I18n.t('admin.custom_emojis.copied_msg') else - redirect_to admin_custom_emojis_path, alert: I18n.t('admin.custom_emojis.copy_failed_msg') + flash[:alert] = I18n.t('admin.custom_emojis.copy_failed_msg') end + + redirect_to admin_custom_emojis_path(params[:page]) end def enable |