summaryrefslogtreecommitdiffstats
path: root/extensions/BugModal
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/BugModal')
-rw-r--r--extensions/BugModal/lib/MonkeyPatches.pm25
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl6
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl4
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/user.html.tmpl6
4 files changed, 8 insertions, 33 deletions
diff --git a/extensions/BugModal/lib/MonkeyPatches.pm b/extensions/BugModal/lib/MonkeyPatches.pm
index 88fce11af..54bd6e560 100644
--- a/extensions/BugModal/lib/MonkeyPatches.pm
+++ b/extensions/BugModal/lib/MonkeyPatches.pm
@@ -40,31 +40,6 @@ sub active_attachments {
1;
-package Bugzilla::User;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-sub moz_nick {
- my ($self) = @_;
- if (!exists $self->{moz_nick}) {
- if ($self->name =~ /:?:(\S+?)\b/) {
- $self->{moz_nick} = $1;
- }
- elsif ($self->name) {
- $self->{moz_nick} = $self->name;
- }
- else {
- $self->login =~ /^([^\@]+)\@/;
- $self->{moz_nick} = $1;
- }
- }
- return $self->{moz_nick};
-}
-
-1;
-
package Bugzilla::Attachment;
use 5.10.1;
diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
index 883393fba..af2077e00 100644
--- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
@@ -146,7 +146,7 @@
[% END %]
<button type="button" class="reply-btn minor"
data-reply-id="[% comment.count FILTER none %]"
- data-reply-name="[% comment.author.name || comment.author.moz_nick FILTER html %]"
+ data-reply-name="[% comment.author.name || comment.author.nick FILTER html %]"
>Reply</button>
[% END %]
<button type="button" class="change-spinner minor" id="cs-[% comment.count FILTER none %]">-</button>
@@ -184,9 +184,9 @@
<tr>
<td class="comment-collapse-reason"
[% IF user.setting("ui_use_absolute_time") == "on" %]
- title="[% comment.author.moz_nick FILTER html %] [[% comment.creation_ts FILTER time("%Y-%m-%d %H:%M %Z") FILTER html %]]">
+ title="[% comment.author.nick FILTER html %] [[% comment.creation_ts FILTER time("%Y-%m-%d %H:%M %Z") FILTER html %]]">
[% ELSE %]
- title="[% comment.author.moz_nick FILTER html %] [[% comment.creation_ts FILTER time_duration FILTER html %]]">
+ title="[% comment.author.nick FILTER html %] [[% comment.creation_ts FILTER time_duration FILTER html %]]">
[% END %]
Comment hidden ([% comment.collapsed_reason FILTER html %])
</td>
diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index d82e1a684..e2c8bba26 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -565,8 +565,8 @@
[%
sub = [];
- sub.push("Reporter: " _ bug.reporter.moz_nick);
- sub.push(unassigned ? "Unassigned" : "Assigned: " _ bug.assigned_to.moz_nick);
+ sub.push("Reporter: " _ bug.reporter.nick);
+ sub.push(unassigned ? "Unassigned" : "Assigned: " _ bug.assigned_to.nick);
IF bug.mentors.size;
sub.push("Mentored");
END;
diff --git a/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl
index 9eda7b936..6a0ce4e24 100644
--- a/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl
@@ -30,9 +30,9 @@ END;
[% IF simple %]
[% IF user.id %]
- <span class="fn" title="[% u.identity FILTER html %]">[% u.moz_nick FILTER html %]</span>
+ <span class="fn" title="[% u.identity FILTER html %]">[% u.nick FILTER html %]</span>
[% ELSE %]
- <span class="fn">[% u.moz_nick FILTER html %]</span>
+ <span class="fn">[% u.nick FILTER html %]</span>
[% END %]
[% ELSE %]
@@ -52,7 +52,7 @@ END;
href="user_profile?user_id=[% u.id FILTER none %]"
[% END %]
>
- <span class="[% user.id ? 'fn' : 'fna' %]">[% nick_only ? u.moz_nick : (u.name || u.nick) FILTER html %]</span>
+ <span class="[% user.id ? 'fn' : 'fna' %]">[% nick_only ? u.nick : (u.name || u.nick) FILTER html %]</span>
[%~~%]
</a>
[% END %]