ui-tag: clean up taginfo

[ps-cgit] / ui-tag.c

diff --git a/ui-tag.c b/ui-tag.c
index ec9c757db22d8196bebefb1ae020ac33ca30b627..3fa63b3e760d3d5ba63e5a381a30e5fed1f491ea 100644 (file)
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -44,44 +44,52 @@ void cgit_print_tag(char *revname)
        struct strbuf fullref = STRBUF_INIT;
        unsigned char sha1[20];
        struct object *obj;
-       struct tag *tag;
-       struct taginfo *info;
 
        if (!revname)
                revname = ctx.qry.head;
 
        strbuf_addf(&fullref, "refs/tags/%s", revname);
        if (get_sha1(fullref.buf, sha1)) {
-               cgit_print_error("Bad tag reference: %s", revname);
+               cgit_print_error_page(404, "Not found",
+                       "Bad tag reference: %s", revname);
                goto cleanup;
        }
        obj = parse_object(sha1);
        if (!obj) {
-               cgit_print_error("Bad object id: %s", sha1_to_hex(sha1));
+               cgit_print_error_page(500, "Internal server error",
+                       "Bad object id: %s", sha1_to_hex(sha1));
                goto cleanup;
        }
        if (obj->type == OBJ_TAG) {
+               struct tag *tag;
+               struct taginfo *info;
+
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
-                       cgit_print_error("Bad tag object: %s", revname);
+                       cgit_print_error_page(500, "Internal server error",
+                               "Bad tag object: %s", revname);
                        goto cleanup;
                }
+               cgit_print_layout_start();
                html("<table class='commit-info'>\n");
                htmlf("<tr><td>tag name</td><td>");
                html_txt(revname);
                htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1));
                if (info->tagger_date > 0) {
                        html("<tr><td>tag date</td><td>");
-                       cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time);
+                       html_txt(show_date(info->tagger_date, info->tagger_tz,
+                                               cgit_date_mode(DATE_ISO8601)));
                        html("</td></tr>\n");
                }
                if (info->tagger) {
                        html("<tr><td>tagged by</td><td>");
+                       cgit_open_filter(ctx.repo->email_filter, info->tagger_email, "tag");
                        html_txt(info->tagger);
                        if (info->tagger_email && !ctx.cfg.noplainemail) {
                                html(" ");
                                html_txt(info->tagger_email);
                        }
+                       cgit_close_filter(ctx.repo->email_filter);
                        html("</td></tr>\n");
                }
                html("<tr><td>tagged object</td><td class='sha1'>");
@@ -91,7 +99,10 @@ void cgit_print_tag(char *revname)
                        print_download_links(revname);
                html("</table>\n");
                print_tag_content(info->msg);
+               cgit_print_layout_end();
+               cgit_free_taginfo(info);
        } else {
+               cgit_print_layout_start();
                html("<table class='commit-info'>\n");
                htmlf("<tr><td>tag name</td><td>");
                html_txt(revname);
@@ -102,6 +113,7 @@ void cgit_print_tag(char *revname)
                if (ctx.repo->snapshots)
                        print_download_links(revname);
                html("</table>\n");
+               cgit_print_layout_end();
        }
 
 cleanup: