Skip to content
Extraits de code Groupes Projets
Valider eb650743 rédigé par Johannes Hackel's avatar Johannes Hackel
Parcourir les fichiers

Fix Bug 2274, empty tag

parent 7e402862
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -22,6 +22,9 @@ class PeopleController < ApplicationController ...@@ -22,6 +22,9 @@ class PeopleController < ApplicationController
if (params[:q][0] == 35 || params[:q][0] == '#') && params[:q].length > 1 if (params[:q][0] == 35 || params[:q][0] == '#') && params[:q].length > 1
redirect_to tag_path(:name => params[:q].gsub(/[#\.]/, ''), :q => params[:q]) redirect_to tag_path(:name => params[:q].gsub(/[#\.]/, ''), :q => params[:q])
return return
elsif (params[:q][0] == 35 || params[:q][0] == '#') && params[:q].length == 1
flash[:error] = I18n.t('tags.show.none', :name => params[:q])
redirect_to multi_path()
end end
limit = params[:limit] ? params[:limit].to_i : 15 limit = params[:limit] ? params[:limit].to_i : 15
......
...@@ -15,13 +15,18 @@ class TagFollowingsController < ApplicationController ...@@ -15,13 +15,18 @@ class TagFollowingsController < ApplicationController
# POST /tag_followings.xml # POST /tag_followings.xml
def create def create
name_normalized = ActsAsTaggableOn::Tag.normalize(params['name']) name_normalized = ActsAsTaggableOn::Tag.normalize(params['name'])
@tag = ActsAsTaggableOn::Tag.find_or_create_by_name(name_normalized)
@tag_following = current_user.tag_followings.new(:tag_id => @tag.id) if name_normalized.nil? || name_normalized.empty?
flash[:error] = I18n.t('tag_followings.create.none', :name => name_normalized)
if @tag_following.save
flash[:notice] = I18n.t('tag_followings.create.success', :name => name_normalized)
else else
flash[:error] = I18n.t('tag_followings.create.failure', :name => name_normalized) @tag = ActsAsTaggableOn::Tag.find_or_create_by_name(name_normalized)
@tag_following = current_user.tag_followings.new(:tag_id => @tag.id)
if @tag_following.save
flash[:notice] = I18n.t('tag_followings.create.success', :name => name_normalized)
else
flash[:error] = I18n.t('tag_followings.create.failure', :name => name_normalized)
end
end end
redirect_to :back redirect_to :back
......
...@@ -846,10 +846,12 @@ en: ...@@ -846,10 +846,12 @@ en:
following: "Following #%{tag}" following: "Following #%{tag}"
stop_following: "Stop Following #%{tag}" stop_following: "Stop Following #%{tag}"
followed_by: 'followed by' followed_by: 'followed by'
none: "The empty tag don't exists!"
tag_followings: tag_followings:
create: create:
success: "Hooray! You're now following #%{name}." success: "Hooray! You're now following #%{name}."
failure: "Failed to follow #%{name}. Are you already following it?" failure: "Failed to follow #%{name}. Are you already following it?"
none: "You can't follow the empty tag!"
destroy: destroy:
success: "Alas! You aren't following #%{name} anymore." success: "Alas! You aren't following #%{name} anymore."
failure: "Failed to stop following #%{name}. Maybe you already stopped following it?" failure: "Failed to stop following #%{name}. Maybe you already stopped following it?"
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter