Author: Ondrej Jirman <ondrej.jirman@zonio.net>
Add option to disable pager to cgit_print_log(). This is needed for upcomming shortlog on summary page patch. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
cgit.c | 2 +- cgit.h | 2 +- ui-log.c | 30 ++++++++++++++++--------------
diff --git a/cgit.c b/cgit.c index e5d8fbd3f7cddc594a6eb594fc1d127b1ef41670..34e590e79dca789d560b308f0b1865f36e4df3f4 100644 --- a/cgit.c +++ b/cgit.c @@ -94,7 +94,7 @@ switch(cgit_cmd) { case CMD_LOG: cgit_print_log(cgit_query_head, cgit_query_ofs, cgit_max_commit_count, cgit_query_search, - cgit_query_path); + cgit_query_path, 1); break; case CMD_TREE: cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path); diff --git a/cgit.h b/cgit.h index 5c55bec4f82211f57c7f3f42226ce444aabfa87d..d6bcde26f08fb3743de1046a88c81b13a9c02917 100644 --- a/cgit.h +++ b/cgit.h @@ -213,7 +213,7 @@ struct cacheitem *item); extern void cgit_print_repolist(struct cacheitem *item); extern void cgit_print_summary(); -extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path); +extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); extern void cgit_print_view(const char *hex, char *path); extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); extern void cgit_print_tree(const char *rev, const char *hex, char *path); diff --git a/ui-log.c b/ui-log.c index 75bbbe48e3c640af1b5db42a9975e5e3f2a40ed9..bb17e1dd98dff3c193fd3afdfd14737ef61cca2c 100644 --- a/ui-log.c +++ b/ui-log.c @@ -54,7 +54,7 @@ cgit_free_commitinfo(info); } -void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path) +void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) { struct rev_info rev; struct commit *commit; @@ -110,19 +110,21 @@ commit->parents = NULL; } html("</table>\n"); - html("<div class='pager'>"); - if (ofs > 0) { - html(" <a href='"); - html(cgit_pageurl(cgit_query_repo, cgit_query_page, - fmt("h=%s&ofs=%d", tip, ofs-cnt))); - html("'>[prev]</a> "); - } + if (pager) { + html("<div class='pager'>"); + if (ofs > 0) { + html(" <a href='"); + html(cgit_pageurl(cgit_query_repo, cgit_query_page, + fmt("h=%s&ofs=%d", tip, ofs-cnt))); + html("'>[prev]</a> "); + } - if ((commit = get_revision(&rev)) != NULL) { - html(" <a href='"); - html(cgit_pageurl(cgit_query_repo, "log", - fmt("h=%s&ofs=%d", tip, ofs+cnt))); - html("'>[next]</a> "); + if ((commit = get_revision(&rev)) != NULL) { + html(" <a href='"); + html(cgit_pageurl(cgit_query_repo, "log", + fmt("h=%s&ofs=%d", tip, ofs+cnt))); + html("'>[next]</a> "); + } + html("</div>"); } - html("</div>"); }