diff options
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/header.html.tmpl | 1 | ||||
| -rw-r--r-- | extensions/BugModal/web/bug_modal.js | 50 | ||||
| -rw-r--r-- | template/en/default/bug/navigate.html.tmpl | 3 |
3 files changed, 34 insertions, 20 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 b86031b40..d51811fab 100644 --- a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl @@ -118,6 +118,7 @@ [% IF user.is_timetracker %] BUGZILLA.remaining_time = [% bug.remaining_time FILTER js %]; // holds the original value [% END %] + BUGZILLA.bug_secure = [% bug.groups_in.size ? '1' : '0' %]; [% END %] [% Hook.process("end") %] diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js index 0dd9305c4..e7a182580 100644 --- a/extensions/BugModal/web/bug_modal.js +++ b/extensions/BugModal/web/bug_modal.js @@ -1027,29 +1027,39 @@ $(function() { }, ] }); + + var format_items = [ + { + name: 'For Printing', + callback: function() { + window.location.href = 'show_bug.cgi?format=multiple&id=' + BUGZILLA.bug_id; + } + }, + { + name: 'XML', + callback: function() { + window.location.href = 'show_bug.cgi?ctype=xml&id=' + BUGZILLA.bug_id; + } + }, + { + name: 'Legacy', + callback: function() { + window.location.href = 'show_bug.cgi?format=default&id=' + BUGZILLA.bug_id; + } + } + ]; + if (!BUGZILLA.bug_secure) { + format_items.push({ + name: 'JSON', + callback: function() { + window.location.href = 'rest/bug/' + BUGZILLA.bug_id; + } + }); + } $.contextMenu({ selector: '#format-btn', trigger: 'left', - items: [ - { - name: 'For Printing', - callback: function() { - window.location.href = 'show_bug.cgi?format=multiple&id=' + BUGZILLA.bug_id; - } - }, - { - name: 'XML', - callback: function() { - window.location.href = 'show_bug.cgi?ctype=xml&id=' + BUGZILLA.bug_id; - } - }, - { - name: 'Legacy', - callback: function() { - window.location.href = 'show_bug.cgi?format=default&id=' + BUGZILLA.bug_id; - } - } - ] + items: format_items }); // "reset to default" checkboxes diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl index 8d7f8df12..f0c924160 100644 --- a/template/en/default/bug/navigate.html.tmpl +++ b/template/en/default/bug/navigate.html.tmpl @@ -28,6 +28,9 @@ [% bug.bug_id FILTER uri %]">Format For Printing</a></li> <li> - <a href="show_bug.cgi?ctype=xml&id= [% bug.bug_id FILTER uri %]">XML</a></li> + [% IF NOT bug.groups_in.size %] + <li> - <a href="rest/bug/[% bug.bug_id FILTER uri %]">JSON</a></li> + [% END %] <li> - <a href="enter_bug.cgi?format=__default__&cloned_bug_id=[% bug.bug_id FILTER uri %]" id="clone_bug" |