diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2011-06-15 10:04:13 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2011-06-15 10:40:13 +0200 |
| commit | 6857bec50a52340fa6b85d626f49d45dd331ed0e (patch) | |
| tree | f746931d5173cab78d32ead3196186c97c5fd9b7 /ui-tree.c | |
| parent | Merge branch 'stable' (diff) | |
| download | cgit-pink-6857bec50a52340fa6b85d626f49d45dd331ed0e.tar.gz cgit-pink-6857bec50a52340fa6b85d626f49d45dd331ed0e.zip | |
ui-tree.c: add support for path-selected submodule links
The current 'repo.module-link' option is sufficient when all gitlinks in a repository can be converted to commit links in a uniform way, but not when different submodules/paths needs different settings. This patch adds support for 'repo.module-link.<path>', which will be used for linking to submodules at paths matching one such entry. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-tree.c')
| -rw-r--r-- | ui-tree.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/ui-tree.c b/ui-tree.c index 442b6be..b1adcc7 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -150,13 +150,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, cgit_print_filemode(mode); html("</td><td>"); if (S_ISGITLINK(mode)) { - htmlf("<a class='ls-mod' href='"); - html_attr(fmt(ctx.repo->module_link, - name, - sha1_to_hex(sha1))); - html("'>"); - html_txt(name); - html("</a>"); + cgit_submodule_link("ls-mod", fullpath, sha1_to_hex(sha1)); } else if (S_ISDIR(mode)) { cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, curr_rev, fullpath); @@ -177,8 +171,9 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, if (ctx.repo->max_stats) cgit_stats_link("stats", NULL, "button", ctx.qry.head, fullpath); - cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev, - fullpath); + if (!S_ISGITLINK(mode)) + cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev, + fullpath); html("</td></tr>\n"); free(name); return 0; |