-rw-r--r-- | ui-repolist.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ui-repolist.c b/ui-repolist.c index ee4facb..725338b 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -54,16 +54,25 @@ int is_match(struct cgit_repo *repo) | |||
54 | return 1; | 54 | return 1; |
55 | if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) | 55 | if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) |
56 | return 1; | 56 | return 1; |
57 | if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) | 57 | if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) |
58 | return 1; | 58 | return 1; |
59 | return 0; | 59 | return 0; |
60 | } | 60 | } |
61 | 61 | ||
62 | int is_in_url(struct cgit_repo *repo) | ||
63 | { | ||
64 | if (!ctx.qry.url) | ||
65 | return 1; | ||
66 | if (repo->url && !prefixcmp(repo->url, ctx.qry.url)) | ||
67 | return 1; | ||
68 | return 0; | ||
69 | } | ||
70 | |||
62 | void print_header(int columns) | 71 | void print_header(int columns) |
63 | { | 72 | { |
64 | html("<tr class='nohover'>" | 73 | html("<tr class='nohover'>" |
65 | "<th class='left'>Name</th>" | 74 | "<th class='left'>Name</th>" |
66 | "<th class='left'>Description</th>" | 75 | "<th class='left'>Description</th>" |
67 | "<th class='left'>Owner</th>" | 76 | "<th class='left'>Owner</th>" |
68 | "<th class='left'>Idle</th>"); | 77 | "<th class='left'>Idle</th>"); |
69 | if (ctx.cfg.enable_index_links) | 78 | if (ctx.cfg.enable_index_links) |
@@ -96,17 +105,17 @@ void cgit_print_repolist() | |||
96 | cgit_print_pageheader(&ctx); | 105 | cgit_print_pageheader(&ctx); |
97 | 106 | ||
98 | if (ctx.cfg.index_header) | 107 | if (ctx.cfg.index_header) |
99 | html_include(ctx.cfg.index_header); | 108 | html_include(ctx.cfg.index_header); |
100 | 109 | ||
101 | html("<table summary='repository list' class='list nowrap'>"); | 110 | html("<table summary='repository list' class='list nowrap'>"); |
102 | for (i=0; i<cgit_repolist.count; i++) { | 111 | for (i=0; i<cgit_repolist.count; i++) { |
103 | ctx.repo = &cgit_repolist.repos[i]; | 112 | ctx.repo = &cgit_repolist.repos[i]; |
104 | if (!is_match(ctx.repo)) | 113 | if (!(is_match(ctx.repo) && is_in_url(ctx.repo))) |
105 | continue; | 114 | continue; |
106 | hits++; | 115 | hits++; |
107 | if (hits <= ctx.qry.ofs) | 116 | if (hits <= ctx.qry.ofs) |
108 | continue; | 117 | continue; |
109 | if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) | 118 | if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) |
110 | continue; | 119 | continue; |
111 | if (!header++) | 120 | if (!header++) |
112 | print_header(columns); | 121 | print_header(columns); |