diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-08-07 10:01:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-07 10:01:55 +0200 |
| commit | ac33f1aedd9a6c72c6c176afb1f5d62a1ce5d44d (patch) | |
| tree | 9bf21d9eb62390f87da145ff880d13a55e9503a7 /app/controllers | |
| parent | 5e35aa82802b09a63d4625fa9c1837ad75178553 (diff) | |
Fix account tags not being saved correctly (#11507)
* Fix account tags not being saved correctly Regression from f371b32 Fix Tag#discoverable not returning tags where listable is nil instead of true Add notice when saving hashtags in admin UI Change public hashtag and directory pages to return 404 for forbidden tags * Remove unused locale string
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/tags_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/directories_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/tags_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb index 0e9dda302..ed271aedc 100644 --- a/app/controllers/admin/tags_controller.rb +++ b/app/controllers/admin/tags_controller.rb @@ -17,7 +17,7 @@ module Admin authorize @tag, :update? if @tag.update(tag_params.merge(reviewed_at: Time.now.utc)) - redirect_to admin_tag_path(@tag.id) + redirect_to admin_tag_path(@tag.id), notice: I18n.t('admin.tags.updated_msg') else render :show end diff --git a/app/controllers/directories_controller.rb b/app/controllers/directories_controller.rb index d2ef76f06..a5c47b515 100644 --- a/app/controllers/directories_controller.rb +++ b/app/controllers/directories_controller.rb @@ -25,7 +25,7 @@ class DirectoriesController < ApplicationController end def set_tag - @tag = Tag.discoverable.find_by!(name: params[:id].downcase) + @tag = Tag.discoverable.find_normalized!(params[:id]) end def set_tags diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 3cd2d9e20..5a6fcc8fd 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -47,7 +47,7 @@ class TagsController < ApplicationController private def set_tag - @tag = Tag.find_normalized!(params[:id]) + @tag = Tag.usable.find_normalized!(params[:id]) end def set_body_classes |