Skip to content

Commit

Permalink
[webui] add branch destination information
Browse files Browse the repository at this point in the history
Show (and link to if it already exists) resulting project on the
'Branch Confirmation' Dialog.

Fixes #2171
  • Loading branch information
agraul committed Dec 1, 2017
1 parent e74a09f commit 707ae1e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion src/api/app/views/webui/package/_branch_dialog.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
<h2 class="box-header">Branch Confirmation</h2>
<div class="dialog-content">
<p>
Do you really want to branch <%= package_link(@package) %>?<br /><br />
Do you want to branch <%= package_link(@package) %> into
<%= project_or_package_link(
project: User.current.branch_project_name(@package.project.name),
short: true) %>?<br /><br />
<a data-target="#branching-options" data-hidetext="[-] Hide options" data-showtext="[+] More options" class="show-hide">[+] More options</a>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/api/spec/features/webui/maintenance_workflow_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
visit package_show_path(project: update_project, package: package)

click_link('Branch package')
expect(page).to have_text('Do you really want to branch package')
expect(page).to have_text('Do you want to branch package')

click_button('Ok')
expect(page).to have_text('Successfully branched package')
Expand Down

0 comments on commit 707ae1e

Please sign in to comment.