diff options
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl | 7 | ||||
| -rw-r--r-- | extensions/BugModal/web/bug_modal.css | 2 | ||||
| -rw-r--r-- | extensions/BugModal/web/bug_modal.js | 12 |
3 files changed, 20 insertions, 1 deletions
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 35621f544..b73761cff 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -473,6 +473,13 @@ inline = 1 edit_only = 1 %] + [% UNLESS prefix %] + <div id="assigned-container" style="display:none"> + <button type="button" class="minor" id="mark-as-assigned-btn"> + Mark as Assigned + </button> + </div> + [% END %] [% IF bug.choices.resolution.only("name", "DUPLICATE").size %] <div id="[% prefix FILTER none %]duplicate-container"> of diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css index fb17a5a71..d895a63dd 100644 --- a/extensions/BugModal/web/bug_modal.css +++ b/extensions/BugModal/web/bug_modal.css @@ -258,7 +258,7 @@ input[type="number"] { margin-left: 8px; } -#duplicate-container, #duplicate-actions, +#duplicate-container, #duplicate-actions, #assigned-container, #bottom-duplicate-container, #bottom-duplicate-actions { display: table-cell; vertical-align: top; diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js index 2a9c3d901..e1ea608a2 100644 --- a/extensions/BugModal/web/bug_modal.js +++ b/extensions/BugModal/web/bug_modal.js @@ -766,6 +766,11 @@ $(function() { $('.take-btn') .click(function(event) { event.preventDefault(); + $('#field-status-view').hide(); + $('#field-status-edit').show(); + if ($('#bug_status option').filter(function() { return $(this).val() == 'ASSIGNED'; }).length) { + $('#assigned-container').show(); + } var field = $(this).data('field'); $('#field-' + field + '.edit-hide').hide(); $('#field-' + field + '.edit-show').show(); @@ -776,6 +781,13 @@ $(function() { } }); + // mark as assigned + $('#mark-as-assigned-btn') + .click(function(event) { + event.preventDefault(); + $('#bug_status').val('ASSIGNED').change(); + }); + // reply button $('.reply-btn') .click(function(event) { |