diff options
| author | Byron Jones <glob@mozilla.com> | 2015-10-15 17:59:10 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-10-15 17:59:10 +0200 |
| commit | 2e2981d25c185fde56f29c7aed4e3e6bba50039e (patch) | |
| tree | 725b4a4b7de9d444ce2b84e9cedce3dc8d7f7896 /extensions/BugModal | |
| parent | 5265c09db899e148ceef6ba47aa199fa1e282e7b (diff) | |
| download | bugzilla-2e2981d25c185fde56f29c7aed4e3e6bba50039e.tar.gz bugzilla-2e2981d25c185fde56f29c7aed4e3e6bba50039e.tar.xz | |
Bug 1153101 - add hooks for edit-comments extension
Diffstat (limited to 'extensions/BugModal')
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl | 1 | ||||
| -rw-r--r-- | extensions/BugModal/web/bug_modal.js | 6 |
2 files changed, 5 insertions, 2 deletions
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 2e81f1aba..0fe644584 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 @@ -111,6 +111,7 @@ <label for="is-private-[% comment.id FILTER none %]">Private</label> </div> [% END %] + [% Hook.process('comment_action', 'bug_modal/activity_stream.html.tmpl') %] [% IF user.id %] [% IF user.can_tag_comments %] <button class="tag-btn minor" type="button" diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js index a5867a971..a4ab7b69b 100644 --- a/extensions/BugModal/web/bug_modal.js +++ b/extensions/BugModal/web/bug_modal.js @@ -1281,8 +1281,10 @@ function bugzilla_ajax(request, done_fn, error_fn) { return $.ajax(request) .done(function(data) { if (data.error) { - $('#xhr-error').html(data.message); - $('#xhr-error').show('fast'); + if (!request.hideError) { + $('#xhr-error').html(data.message); + $('#xhr-error').show('fast'); + } if (error_fn) error_fn(data.message); } |