diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2012-01-31 01:20:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-01 12:52:50 -0800 |
| commit | abc0c9d2d7312c4b153ba1b2b9cd8ba0696f1b04 (patch) | |
| tree | 58922da8c7ba31df112dc56b918da1737d014018 | |
| parent | a1e1b2d77b9fc5866d12bf984214b15f1dccf4a8 (diff) | |
| download | git-abc0c9d2d7312c4b153ba1b2b9cd8ba0696f1b04.tar.gz | |
gitweb: Make project search respect project_filter
Make gitweb search within filtered projects (i.e. projects shown), and
change "List all projects" to "List all projects in '$project_filter/'"
if project_filter is used.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | gitweb/gitweb.perl | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index c81743b0a1..f211594c45 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -5161,11 +5161,18 @@ sub git_patchset_body { sub git_project_search_form { my ($searchtext, $search_use_regexp); + my $limit = ''; + if ($project_filter) { + $limit = " in '$project_filter/'"; + } + print "<div class=\"projsearch\">\n"; print $cgi->startform(-method => 'get', -action => $my_uri) . - $cgi->hidden(-name => 'a', -value => 'project_list') . "\n" . - $cgi->textfield(-name => 's', -value => $searchtext, - -title => 'Search project by name and description', + $cgi->hidden(-name => 'a', -value => 'project_list') . "\n"; + print $cgi->hidden(-name => 'pf', -value => $project_filter). "\n" + if (defined $project_filter); + print $cgi->textfield(-name => 's', -value => $searchtext, + -title => "Search project by name and description$limit", -size => 60) . "\n" . "<span title=\"Extended regular expression\">" . $cgi->checkbox(-name => 'sr', -value => 1, -label => 're', @@ -5173,8 +5180,9 @@ sub git_project_search_form { "</span>\n" . $cgi->submit(-name => 'btnS', -value => 'Search') . $cgi->end_form() . "\n" . - $cgi->a({-href => href(project => undef, searchtext => undef)}, - 'List all projects') . "<br />\n"; + $cgi->a({-href => href(project => undef, searchtext => undef, + project_filter => $project_filter)}, + esc_html("List all projects$limit")) . "<br />\n"; print "</div>\n"; } |