diff options
| author | Byron Jones <glob@mozilla.com> | 2015-05-07 06:27:43 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-05-07 06:27:43 +0200 |
| commit | 54fb248d58c8db0082c4d034912c325ae0d0acaf (patch) | |
| tree | 21a61f652401c45809ac68f1a715c94f26624510 | |
| parent | 239c60d1328ef221421bdd1a9bc28467fbe4077a (diff) | |
| download | bugzilla-54fb248d58c8db0082c4d034912c325ae0d0acaf.tar.gz bugzilla-54fb248d58c8db0082c4d034912c325ae0d0acaf.tar.xz | |
Bug 1161567: always show the intermediate confirmation page when not using the modal view
| -rw-r--r-- | Bugzilla/Bug.pm | 9 | ||||
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 9534b49e2..fbb57409a 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -2698,8 +2698,13 @@ sub _set_product { my $verified = $params->{product_change_confirmed}; - # BMO - if everything is ok then we can skip the verfication page - if (!$verified && $component_ok && $version_ok && $milestone_ok) { + # BMO - if everything is ok then we can skip the verfication page when using bug_modal + if (Bugzilla->input_params->{format} // '' eq 'modal' + && !$verified + && $component_ok + && $version_ok + && $milestone_ok + ) { $invalid_groups = $self->get_invalid_groups({ bug_ids => \@idlist, product => $product }); my $has_invalid_group = 0; foreach my $group (@$invalid_groups) { 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 57afb2cfe..d9f79a305 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -129,6 +129,7 @@ <input type="hidden" name="delta_ts" value="[% bug.delta_ts FILTER html %]"> <input type="hidden" name="longdesclength" value="[% bug.comments.size FILTER html %]"> <input type="hidden" name="id" id="bug_id" value="[% bug.bug_id FILTER html %]"> + <input type="hidden" name="format" value="modal"> <input type="hidden" name="token" value="[% issue_hash_token([bug.id, bug.delta_ts]) FILTER html %]"> [% END %] |