Merge pull request #4173 from alexandergraul/branch-pkg-info

[webui] add branch destination information
openSUSE · Dec 1, 2017 · 0d63239 · 0d63239
2 parents 4ed5c54 + 707ae1e
commit 0d63239
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/api/app/views/webui/package/_branch_dialog.html.erb b/src/api/app/views/webui/package/_branch_dialog.html.erb
@@ -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>

diff --git a/src/api/spec/features/webui/maintenance_workflow_spec.rb b/src/api/spec/features/webui/maintenance_workflow_spec.rb
@@ -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')