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

Keep searched tag in the search field. Closes #1983.

Browse source
This commit is contained in:
Gonzalo Rodriguez 2011-10-12 04:09:24 -02:00
parent f0b219f474
commit 6849c3604b
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/people_controller.rb
View file

@ -18,7 +18,7 @@ class PeopleController < ApplicationController
params[:q] ||= params[:term] || '' params[:q] ||= params[:term] || ''
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(/[#\.]/, '')) redirect_to tag_path(:name => params[:q].gsub(/[#\.]/, ''), :q => params[:q])
return return
end end

5
features/tags.feature
View file

@ -11,6 +11,11 @@ Feature: Interacting with tags
Then I should be on the tag page for "rockstar" Then I should be on the tag page for "rockstar"
And I should see "Samuel Beckett" And I should see "Samuel Beckett"
Scenario: Searching for a tag keeps the search term in the search field
When I search for "#rockstar"
Then I should be on the tag page for "rockstar"
And the "q" field within "#global_search" should contain "#rockstar"
@wip @wip
Scenario: adding a contact from a tag page Scenario: adding a contact from a tag page
When I search for "#rockstar" When I search for "#rockstar"