nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Bug 2274, empty tag

Browse source
This commit is contained in:
Johannes Hackel 2011-11-22 12:16:00 +01:00
parent 7e4028626f
commit eb65074360
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/people_controller.rb
View file

@ -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

17
app/controllers/tag_followings_controller.rb
View file

@ -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

2
config/locales/diaspora/en.yml
View file

@ -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?"