mirror of
https://git.zx2c4.com/cgit
synced 2024-11-26 18:38:42 +00:00
Fix search form action/hidden fields
The search form didn't properly honor the current path, so this commit fixes cgit_fileurl() and add_hidden_formfields() to make the issue go away. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
parent
51140311bb
commit
68cf9b4f85
42
ui-shared.c
42
ui-shared.c
@ -60,19 +60,21 @@ char *cgit_repourl(const char *reponame)
|
|||||||
char *cgit_fileurl(const char *reponame, const char *pagename,
|
char *cgit_fileurl(const char *reponame, const char *pagename,
|
||||||
const char *filename, const char *query)
|
const char *filename, const char *query)
|
||||||
{
|
{
|
||||||
|
char *tmp;
|
||||||
|
char *delim;
|
||||||
|
|
||||||
if (cgit_virtual_root) {
|
if (cgit_virtual_root) {
|
||||||
if (query)
|
tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame,
|
||||||
return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame,
|
pagename, (filename ? filename:""));
|
||||||
pagename, filename?filename:"", query);
|
delim = "?";
|
||||||
else
|
|
||||||
return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
|
|
||||||
pagename);
|
|
||||||
} else {
|
} else {
|
||||||
if (query)
|
tmp = fmt("?url=%s/%s/%s", reponame, pagename,
|
||||||
return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
|
(filename ? filename : ""));
|
||||||
else
|
delim = "&";
|
||||||
return fmt("?r=%s&p=%s", reponame, pagename);
|
|
||||||
}
|
}
|
||||||
|
if (query)
|
||||||
|
tmp = fmt("%s%s%s", tmp, delim, query);
|
||||||
|
return tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *cgit_pageurl(const char *reponame, const char *pagename,
|
char *cgit_pageurl(const char *reponame, const char *pagename,
|
||||||
@ -421,13 +423,15 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void add_hidden_formfields(int incl_head, int incl_search)
|
void add_hidden_formfields(int incl_head, int incl_search, char *page)
|
||||||
{
|
{
|
||||||
|
char *url;
|
||||||
|
|
||||||
if (!cgit_virtual_root) {
|
if (!cgit_virtual_root) {
|
||||||
if (cgit_query_repo)
|
url = fmt("%s/%s", cgit_query_repo, page);
|
||||||
html_hidden("r", cgit_query_repo);
|
if (cgit_query_path)
|
||||||
if (cgit_query_page)
|
url = fmt("%s/%s", url, cgit_query_path);
|
||||||
html_hidden("p", cgit_query_page);
|
html_hidden("url", url);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
|
if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
|
||||||
@ -483,7 +487,7 @@ void cgit_print_pageheader(char *title, int show_search)
|
|||||||
|
|
||||||
html("<p>\n<h1>branch</h1>\n");
|
html("<p>\n<h1>branch</h1>\n");
|
||||||
html("<form method='get' action=''>\n");
|
html("<form method='get' action=''>\n");
|
||||||
add_hidden_formfields(0, 1);
|
add_hidden_formfields(0, 1, cgit_query_page);
|
||||||
html("<select name='h' onchange='this.form.submit();'>\n");
|
html("<select name='h' onchange='this.form.submit();'>\n");
|
||||||
for_each_branch_ref(print_branch_option, cgit_query_head);
|
for_each_branch_ref(print_branch_option, cgit_query_head);
|
||||||
html("</select>\n");
|
html("</select>\n");
|
||||||
@ -491,9 +495,11 @@ void cgit_print_pageheader(char *title, int show_search)
|
|||||||
|
|
||||||
html("<p>\n<h1>search</h1>\n");
|
html("<p>\n<h1>search</h1>\n");
|
||||||
html("<form method='get' action='");
|
html("<form method='get' action='");
|
||||||
html_attr(cgit_pageurl(cgit_query_repo, "log", NULL));
|
if (cgit_virtual_root)
|
||||||
|
html_attr(cgit_fileurl(cgit_query_repo, "log",
|
||||||
|
cgit_query_path, NULL));
|
||||||
html("'>\n");
|
html("'>\n");
|
||||||
add_hidden_formfields(1, 0);
|
add_hidden_formfields(1, 0, "log");
|
||||||
html("<select name='qt'>\n");
|
html("<select name='qt'>\n");
|
||||||
html_option("grep", "log msg", cgit_query_grep);
|
html_option("grep", "log msg", cgit_query_grep);
|
||||||
html_option("author", "author", cgit_query_grep);
|
html_option("author", "author", cgit_query_grep);
|
||||||
|
Loading…
Reference in New Issue
Block a user