Merge pull request #9536 from dmarcoux/release-request-modal-to-page

Move project release request modal to its own page

src/api/app/controllers/webui/project_controller.rb

@@ -6,11 +6,11 @@ class Webui::ProjectController < Webui::WebuiController
 
   before_action :lockout_spiders, only: [:requests, :buildresults]
 
-  before_action :require_login, only: [:create, :toggle_watch, :destroy, :new,
+  before_action :require_login, only: [:create, :toggle_watch, :destroy, :new, :release_request,
                                        :new_release_request, :new_package, :edit_comment]
 
   before_action :set_project, only: [:autocomplete_repositories, :users, :subprojects,
-                                     :new_package, :edit,
+                                     :new_package, :edit, :release_request,
                                      :show, :buildresult,
                                      :destroy, :remove_path_from_target,
                                      :requests, :save, :monitor, :toggle_watch,
@@ -91,6 +91,10 @@ def new_package
     authorize @project, :update?
   end
 
+  def release_request
+    authorize @project, :update?
+  end
+
   def new_release_request
     if params[:skiprequest]
       # FIXME2.3: do it directly here, api function missing

src/api/app/views/webui/project/_breadcrumb_items.html.haml

@@ -35,3 +35,6 @@
     - elsif current_page?(project_subprojects_path(@project))
       %li.breadcrumb-item.active{ 'aria-current' => 'page' }
         Subprojects
+    - elsif current_page?(project_release_request_path(@project))
+      %li.breadcrumb-item.active{ 'aria-current' => 'page' }
+        Create Maintenance Release Request

src/api/app/views/webui/project/bottom_actions/_request_to_release.html.haml

@@ -1,4 +1,4 @@
 %li.list-inline-item
-  = link_to('#', class: 'nav-link', data: { toggle: 'modal', target: '#project-release-request-modal' }) do
+  = link_to(project_release_request_path(@project), class: 'nav-link') do
     %i.fas.fa-share-square.text-warning
     Request to Release

src/api/app/views/webui/project/release_request.html.haml

@@ -0,0 +1,22 @@
+- @pagetitle = 'Create Maintenance Release Request'
+
+.row
+  .col
+    .card
+      = render partial: 'tabs', locals: { project: @project }
+      .card-body
+        .row
+          .col-12
+            %h3= @pagetitle
+          .col-12
+            %p Do you want to release #{link_to(@project, project_show_path(@project))} as a maintenance update?
+          .col-12.col-md-9.col-lg-6
+            = form_tag(project_new_release_request_path(@project)) do
+              = hidden_field_tag(:project, @project.name)
+              .form-group
+                = label_tag(:sourceproject, 'From Project:')
+                = text_field_tag(:sourceproject, @project.name, disabled: true, class: 'form-control')
+              .form-group
+                = label_tag(:description, 'Description:')
+                = text_area_tag(:description, '', rows: 3, class: 'form-control')
+              = submit_tag('Create', class: 'btn btn-sm btn-primary px-4')

src/api/app/views/webui/project/responsive_ux/show_actions/_request_to_release.html.haml

@@ -1,4 +1,4 @@
 %li.nav-item
-  = link_to('#', class: 'nav-link', data: { toggle: 'modal', target: '#project-release-request-modal' }) do
+  = link_to(project_release_request_path(@project), class: 'nav-link') do
     %i.fas.fa-share-square.fa-lg.mr-2
     Request to Release

src/api/app/views/webui/project/show.html.haml

@@ -85,9 +85,7 @@
       = render partial: 'create_package_modal', locals: { project: @project }
       = render partial: 'new_package_branch_modal', locals: { project: @project, remote_projects: @remote_projects }
 
-    - if can_be_released?(@project, @packages, @open_release_requests, @has_patchinfo)
-      = render partial: 'project_release_request_dialog', locals: { project: @project }
-    - elsif !@project.is_maintenance?
+    - if !can_be_released?(@project, @packages, @open_release_requests, @has_patchinfo) && !@project.is_maintenance?
       = render partial: 'project_submit_update_dialog', locals: { project: @project, release_targets: @releasetargets }
   - elsif !@project.is_locked?
     = render partial: 'webui/request/add_role_request_dialog', locals: { project: @project }

src/api/config/routes/webui_routes.rb

@@ -184,6 +184,7 @@
       get 'project/subprojects/:project' => :subprojects, constraints: cons, as: 'project_subprojects'
       get 'project/attributes/:project', to: redirect('/attribs/%{project}'), constraints: cons
       get 'project/new_package/:project' => :new_package, constraints: cons, as: 'project_new_package'
+      get 'project/release_request/(:project)' => :release_request, constraints: cons, as: :project_release_request
       post 'project/new_release_request/(:project)' => :new_release_request, constraints: cons, as: :project_new_release_request
       get 'project/show/:project' => :show, constraints: cons, as: 'project_show'
       get 'project/buildresult' => :buildresult, constraints: cons, as: 'project_buildresult'