diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-07-08 06:59:55 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-07-08 06:59:55 +0200 |
| commit | be1f92450788dc89280c9e04a4bf983b5d7fac54 (patch) | |
| tree | b5513fd846597fe5f152177dbbda88dca08fdf5f /extensions/BugModal/template/en | |
| parent | 9bbd8d368598046c47964ee043620621b6c3634b (diff) | |
| parent | 446a08b30b0dbaac9f2b88e0a5cad410f0446140 (diff) | |
| download | bugzilla-be1f92450788dc89280c9e04a4bf983b5d7fac54.tar.gz bugzilla-be1f92450788dc89280c9e04a4bf983b5d7fac54.tar.xz | |
Merge remote-tracking branch 'bmo/master'
Diffstat (limited to 'extensions/BugModal/template/en')
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/header.html.tmpl | 8 | ||||
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/user.html.tmpl | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl index 38b6b572f..b9a42caf3 100644 --- a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl @@ -83,12 +83,7 @@ [%# update last-visited %] [% IF user.id && user.is_involved_in_bug(bug) %] - $(function() { - bugzilla_ajax({ - url: 'rest/bug_user_last_visit/[% bug.id FILTER none %]', - type: 'POST' - }); - }); + document.addEventListener('DOMContentLoaded', () => show_new_changes_indicator(), { once: true }); [% END %] [%# expose useful data to js %] @@ -100,6 +95,7 @@ is_insider: [% user.is_insider ? "true" : "false" %], is_timetracker: [% user.is_timetracker ? "true" : "false" %], can_tag: [% user.can_tag_comments ? "true" : "false" %], + timezone: '[% user.timezone.name FILTER js %]', settings: { quote_replies: '[% user.settings.quote_replies.value FILTER js %]', zoom_textareas: [% user.settings.zoom_textareas.value == "on" ? "true" : "false" %], 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 cd05d053f..9eda7b936 100644 --- a/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl @@ -46,7 +46,7 @@ END; href="mailto:[% u.email FILTER html %]" data-user-email="[% u.email FILTER html %]" data-user-id="[% u.id FILTER html %]" - data-show-edit="[% user.in_group('editusers') || user.bless_groups.size > 0 ? 1 : 0 %]" + data-show-edit="[% user.in_group('editusers') || user.in_group('disableusers') || user.bless_groups.size > 0 ? 1 : 0 %]" title="[% u.identity FILTER html %]" [% ELSE %] href="user_profile?user_id=[% u.id FILTER none %]" |