Skip to content

Commit

Permalink
Refactor change_devel_request_modal view
Browse files Browse the repository at this point in the history
This modal had some "if" not needed anymore so we simplified the code a
lot.

Also we marked the request controller action to be deleted in the
migration to Boostrap.

Co-authored-by: David Kang <dkang@suse.com>
  • Loading branch information
Moises Deniz Aleman and David Kang committed Sep 20, 2018
1 parent 15273c4 commit b90d6f6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
1 change: 1 addition & 0 deletions src/api/app/controllers/webui/request_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ def set_bugowner_request
redirect_to controller: :request, action: :show, number: request.number
end

# TODO: This action needs to be removed when migrating to Bootstrap, is not needed in the webui2
def change_devel_request_dialog
@package = Package.find_by_project_and_name(params[:project], params[:package])
if @package.develpackage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,16 @@
- current_devel_package = package.develpackage.name
- current_devel_project = package.develpackage.project.name

.modal.fade#change-devel-request-modal{ tabindex: -1, role: 'dialog', aria: { labelledby: 'change-devel-request-modal-label', hidden: true } }
.modal-dialog.modal-dialog-centered{ role: 'document' }
.modal-content
= form_tag(change_devel_request_path(project: project, package: package), method: :post) do
.modal-header
%h5.modal-title Change Devel Project Request
.modal-body
- if current_devel_project && current_devel_package
%p
-# FIXME: get rid of this helper
Do you want to request to change the devel project for #{package_link(package)} from
\#{project_or_package_link(project: current_devel_project)}?
- else
%p
-# FIXME: get rid of this helper
Do you want to request to set the devel project for #{package_link(package)}?
%p
-# FIXME: get rid of this helper
Do you want to request to change the devel project for #{package_link(package)} from
\#{project_or_package_link(project: package.develpackage.project.name)}?
.form-group
- if current_devel_project && current_devel_package
= label_tag(:devel_project, 'New Devel project (leave free to delete the current one):')
- else
= label_tag(:devel_project, 'Devel project:')
= label_tag(:devel_project, 'New Devel project (leave free to delete the current one):')
= text_field_tag(:devel_project, '', required: true, class: 'form-control')
.form-group
= label_tag(:description, 'Description:')
Expand Down
1 change: 1 addition & 0 deletions src/api/spec/features/webui/packages_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
visit package_show_path(project: user.home_project, package: package)
expect(page).to have_text('1 derived package')
click_link('derived package')
sleep 1 # Needed to avoid a flickering test. Sometimes the modal is shown too late and the click doen't work
expect(page).to have_link('home:package_test_user...ome:package_test_user')
click_link('home:package_test_user...ome:package_test_user')
expect(page.current_path).to eq(package_show_path(project: branched_project, package: branched_project.packages.first))
Expand Down

0 comments on commit b90d6f6

Please sign in to comment.