Create LinkToUser module and drop Maintainer module

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 086c58e4e8492b0772656a1d1fdbd1cd9aadc8f1..6cd91481a12781c95d867bc209f5923e34a206de 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -263,13 +263,13 @@ dist_templates_modules_DATA = \
        src/templates/modules/files-table.html \
        src/templates/modules/footer.html \
        src/templates/modules/jobs-table.html \
+       src/templates/modules/link-to-user.html \
        src/templates/modules/log-entry-comment.html \
        src/templates/modules/log-entry.html \
        src/templates/modules/log-entry-small.html \
        src/templates/modules/log-files-table.html \
        src/templates/modules/log.html \
        src/templates/modules/log-table.html \
-       src/templates/modules/maintainer.html \
        src/templates/modules/modal-base.html \
        src/templates/modules/modal-build-comment.html \
        src/templates/modules/modal-build-push.html \

diff --git a/src/templates/build-detail.html b/src/templates/build-detail.html
index 0d53c15849be33a378123d5e203ccb049453cd11..57d06992e0a1a7f5ca641dfa2ca13be72d0b48de 100644 (file)
--- a/src/templates/build-detail.html
+++ b/src/templates/build-detail.html
@@ -95,7 +95,7 @@
                                                        <hr>
 
                                                        <p class="muted">
-                                                               {{ _("Author") }} {% module Maintainer(build.commit.author) %}
+                                                               {{ _("Author") }} {% module LinkToUser(build.commit.author) %}
                                                                &dash;
                                                                {{ _("Commit") }} <a href="/distro/{{ build.distro.identifier }}/source/{{ build.pkg.commit.source.identifier }}/{{ build.pkg.commit.revision }}">{{ build.pkg.commit.revision[:7] }}</a>
                                                        </p>

diff --git a/src/templates/distro-source-commit-detail.html b/src/templates/distro-source-commit-detail.html
index 9f26c81e181ee9f7b58cb4a05cbe03c51b144fc9..25d98bd1b3c4b62d2421412cfb281fc19d65dac9 100644 (file)
--- a/src/templates/distro-source-commit-detail.html
+++ b/src/templates/distro-source-commit-detail.html
@@ -53,11 +53,11 @@
                                        </tr>
                                        <tr>
                                                <td>{{ _("Author") }}</td>
-                                               <td>{% raw format_email(commit.author) %}</td>
+                                               <td>{% module LinkToUser(commit.author) %}</td>
                                        </tr>
                                        <tr>
                                                <td>{{ _("Committer") }}</td>
-                                               <td>{% raw format_email(commit.committer) %}</td>
+                                               <td>{% module LinkToUser(commit.committer) %}</td>
                                        </tr>
 
                                        {% if commit.message %}

diff --git a/src/templates/modules/build-table.html b/src/templates/modules/build-table.html
index fe57af8908945a05662f30a53b1caa8778fc566a..a2d5438f7e37c27a4db84f323678236a32e1b362 100644 (file)
--- a/src/templates/modules/build-table.html
+++ b/src/templates/modules/build-table.html
@@ -47,10 +47,10 @@
                                                {% if show_user %}
                                                        {% if build.type == "scratch" and build.user %}
                                                                <td>
-                                                                       {% module Maintainer(build.user) %}
+                                                                       {% module LinkToUser(build.user) %}
                                                                </td>
                                                        {% elif build.type == "release" %}
-                                                               <td>{% module Maintainer(build.pkg.maintainer) %}</td>
+                                                               <td>{% module LinkToUser(build.pkg.maintainer) %}</td>
                                                        {% else %}
                                                                <td></td>
                                                        {% end %}

diff --git a/src/templates/modules/changelog/entry.html b/src/templates/modules/changelog/entry.html
index c4a8460f7d93a366a3026a70c57bb78532ec4ceb..1e4ba8280fbc26a414bde2a09fd563d97f212720 100644 (file)
--- a/src/templates/modules/changelog/entry.html
+++ b/src/templates/modules/changelog/entry.html
@@ -33,7 +33,7 @@
                                        <hr>
 
                                        <p class="muted">
-                                               {{ _("Author") }} {% module Maintainer(build.commit.author) %}
+                                               {{ _("Author") }} {% module LinkToUser(build.commit.author) %}
                                                <span class="pull-right">{{ locale.format_date(build.created, shorter=True) }}</span>
                                        </p>
                                {% else %}
@@ -45,7 +45,7 @@
 
                        {% elif build.type == "scratch" %}
                                <p class="muted">
-                                       {{ _("Owner") }} {% module Maintainer(build.owner) %}
+                                       {{ _("Owner") }} {% module LinkToUser(build.owner) %}
 
                                        <span class="pull-right">{{ locale.format_date(build.created, shorter=True) }}</span>
                                </p>

diff --git a/src/templates/modules/link-to-user.html b/src/templates/modules/link-to-user.html
new file mode 100644 (file)
index 0000000..08460a1
--- /dev/null
+++ b/src/templates/modules/link-to-user.html
@@ -0,0 +1,16 @@
+{% if isinstance(user, users.User) %}
+       {% if user.is_admin() %}
+               <i class="icon-star"></i>
+       {% else %}
+               <i class="icon-user"></i>
+       {% end %}
+       <a href="/user/{{ user.name }}">
+               {{ user.realname }}
+       </a>
+{% elif user %}
+       {% import email.utils %}
+       {% set name, email_address = email.utils.parseaddr(user) %}
+
+       <i class="icon-envelope"></i>
+       <a href="mailto:{{ email_address }}">{{ name or email_address }}</a>
+{% end %}
\ No newline at end of file

diff --git a/src/templates/modules/maintainer.html b/src/templates/modules/maintainer.html
deleted file mode 100644 (file)
index be9c251..0000000
--- a/src/templates/modules/maintainer.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% if type == "string" and maintainer %}
-       <i class="icon-envelope"></i>
-       {% raw format_email(maintainer) %}
-{% elif type == "user" %}
-       {% if maintainer.is_admin() %}
-               <i class="icon-star"></i>
-       {% else %}
-               <i class="icon-user"></i>
-       {% end %}
-       <a href="/user/{{ maintainer.name }}">
-               {{ maintainer.realname }}
-       </a>
-{% end %}

diff --git a/src/templates/modules/package-header.html b/src/templates/modules/package-header.html
index d3d6c5ba3a14a97ac668b47f212a591f0f246237..0feaa871e628b3fe935219fb32fdddd85f5d3d18 100644 (file)
--- a/src/templates/modules/package-header.html
+++ b/src/templates/modules/package-header.html
@@ -22,6 +22,6 @@
 
        {% if pkg.maintainer %}
                <dt>{{ _("Maintainer") }}</dt>
-               <dd>{% module Maintainer(pkg.maintainer) %}</dd>
+               <dd>{% module LinkToUser(pkg.maintainer) %}</dd>
        {% end %}
 </dl>

diff --git a/src/templates/package-detail.html b/src/templates/package-detail.html
index 8d89a055d13611ef2926ee4775c33b498eaa9284..0f3dc147f94766b09aca5705e127de209101cb18 100644 (file)
--- a/src/templates/package-detail.html
+++ b/src/templates/package-detail.html
@@ -75,7 +75,7 @@
                                        {% if pkg.maintainer %}
                                                <tr>
                                                        <td>{{ _("Maintainer") }}</td>
-                                                       <td>{% module Maintainer(pkg.maintainer) %}</td>
+                                                       <td>{% module LinkToUser(pkg.maintainer) %}</td>
                                                </tr>
                                        {% end %}
                                        <tr>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 754b0b5281e0cdb2044245ed83a03bebbb85317e..5be08d83bc05dae596b34055cde772915f9020c3 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -80,9 +80,9 @@ class Application(tornado.web.Application):
                                "JobsTable"          : ui_modules.JobsTableModule,
                                "CommentsTable"      : ui_modules.CommentsTableModule,
                                "FilesTable"         : ui_modules.FilesTableModule,
+                               "LinkToUser"         : ui_modules.LinkToUserModule,
                                "LogTable"           : ui_modules.LogTableModule,
                                "LogFilesTable"      : ui_modules.LogFilesTableModule,
-                               "Maintainer"         : ui_modules.MaintainerModule,
                                "PackagesTable"      : ui_modules.PackagesTableModule,
                                "PackageTable2"      : ui_modules.PackageTable2Module,
                                "PackageHeader"      : ui_modules.PackageHeaderModule,

diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index ee8e5c1abb8e06ff10973ca455a78bd9b7bd1543..5a609c9b437f1690cc41af9944373823e0f03b91 100644 (file)
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -380,15 +380,9 @@ class LogEntryCommentModule(LogEntryModule):
                        entry=entry, u=entry.user, show_build=show_build, **args)
 
 
-class MaintainerModule(UIModule):
-       def render(self, maintainer):
-               if isinstance(maintainer, users.User):
-                       type = "user"
-               else:
-                       type = "string"
-
-               return self.render_string("modules/maintainer.html",
-                       type=type, maintainer=maintainer)
+class LinkToUserModule(UIModule):
+       def render(self, user):
+               return self.render_string("modules/link-to-user.html", user=user, users=users)
 
 
 class BuildLogModule(UIModule):