dist_templates_events_modules_DATA = \
src/templates/events/modules/list.html \
+ src/templates/events/modules/build-comment.html \
src/templates/events/modules/system-message.html \
src/templates/events/modules/user-message.html
builds.created_at AS t,
4 AS priority,
builds.id AS build,
+ NULL::integer AS build_comment,
builds.owner_id AS by_user
FROM
builds
ELSE 4
END AS priority,
builds.id AS build,
+ NULL AS build_comment,
NULL AS by_user
FROM
builds
WHERE
builds.finished_at IS NOT NULL
+
+ UNION ALL
+
+ -- Build Comments
+ SELECT
+ 'build-comment' AS type,
+ build_comments.created_at AS t,
+ 4 AS priority,
+ build_comments.build_id AS build,
+ build_comments.id AS build_comment,
+ build_comments.user_id AS by_user
+ FROM
+ build_comments
+ WHERE
+ deleted IS FALSE
)
"""
def map(self):
return {
# Builds
- "build" : self.backend.builds.get_by_id,
+ "build" : self.backend.builds.get_by_id,
+
+ # Build Comments
+ "build_comment" : self.backend.builds.comments.get_by_id,
# Users
"by_user" : self.backend.users.get_by_id,
--- /dev/null
+{% extends "user-message.html" %}
+
+{% block content %}
+ {% module Text(comment.text) %}
+{% end %}
{% for event in events %}
- {% if event.by_user %}
+ {% if event.build_comment %}
+ {% module EventBuildComment(event) %}
+ {% elif event.by_user %}
{% module EventUserMessage(event) %}
{% else %}
{% module EventSystemMessage(event) %}
{% block thumbnail %}{% end block %}
<div class="media-object-section main-section">
- {% if event.type == "build-created" %}
- <p>
- {{ _("Build created") }}
- </p>
- {% else %}
- <p>
- {{ _("- Unknown Event -") }}
- </p>
+ {% block content %}
+ {% if event.type == "build-created" %}
+ <p>
+ {{ _("Build created") }}
+ </p>
+ {% else %}
+ <p>
+ {{ _("- Unknown Event -") }}
+ </p>
+ {% end %}
{% end %}
<small>
# Events
"EventsList" : events.ListModule,
+ "EventBuildComment" : events.BuildCommentModule,
"EventSystemMessage" : events.SystemMessageModule,
"EventUserMessage" : events.UserMessageModule,
return self.render_string("events/modules/list.html", events=events)
+class BuildCommentModule(ui_modules.UIModule):
+ def render(self, event):
+ return self.render_string("events/modules/build-comment.html",
+ event=event, comment=event.build_comment)
+
+
class UserMessageModule(ui_modules.UIModule):
def render(self, event):
return self.render_string("events/modules/user-message.html", event=event)