Merge pull request #6512 from vpereira/subprojects_table_partial

Extract tables from ProjectController#subprojects view to partial
openSUSE · Dec 9, 2018 · 421990a · 421990a
2 parents 37fd651 + 4a86467
commit 421990a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 34 deletions.
diff --git a/src/api/app/views/webui2/webui/project/_subprojects_table.html.haml b/src/api/app/views/webui2/webui/project/_subprojects_table.html.haml
@@ -0,0 +1,11 @@
+%h3 #{table_title.pluralize} of #{project}
+%table.responsive.table.table-striped.table-bordered.subproject-table
+  %thead
+    %tr
+      %th= table_title
+      %th Title
+  %tbody
+    - projects.each do |project|
+      %tr
+        %td.project_name= link_to(word_break(project.name), project_show_path(project))
+        %td.project_title= word_break(project.title)
diff --git a/src/api/app/views/webui2/webui/project/subprojects.html.haml b/src/api/app/views/webui2/webui/project/subprojects.html.haml
@@ -7,53 +7,22 @@
     .row
       .col-md-12
         - if @parentprojects.present?
-          %h3 Parent projects of #{@project}
-          %table.responsive.table.table-striped.table-bordered.subproject-table
-            %thead
-              %tr
-                %th Parent Project
-                %th Title
-            %tbody
-              - @parentprojects.each do |project|
-                %tr
-                  %td.project_name= link_to(word_break(project.name), project_show_path(project))
-                  %td.project_title= word_break(project.title)
+          = render partial: 'subprojects_table', locals: { table_title: 'Parent Project', project: @project, projects: @parentprojects }
     .row{ class: ('mt-3' if @parentprojects.present?) }
       .col-md-12
-        %h3.d-md-inline-block Subprojects of #{@project}
         - if @subprojects.present?
-          %table.responsive.table.table-striped.table-bordered.subproject-table
-            %thead
-              %tr
-                %th Subproject
-                %th Title
-            %tbody
-              - @subprojects.each do |project|
-                %tr
-                  %td.project_name= link_to(word_break(remove_parent_name(project.name, @project.name), 50), project_show_path(project))
-                  %td.project_title= word_break(project.title)
+          = render partial: 'subprojects_table', locals: { table_title: 'Subproject', project: @project, projects: @subprojects }
         - else
           %p
             %i This project has no subprojects
         - if User.current.can_modify?(@project)
           = link_to('#', data: { toggle: 'modal', target: '#add-new-subproject-modal' }, title: 'Add New Subproject', class: 'nav-link') do
             %i.fas.fa-plus-circle.text-primary
             Add New Subproject
-
     .row.mt-3
       .col-md-12
         - if @siblings.present?
-          %h3 Sibling projects of #{@project}
-          %table.responsive.table.table-striped.table-bordered.subproject-table
-            %thead
-              %tr
-                %th Sibling Project
-                %th Title
-            %tbody
-              - @siblings.each do |project|
-                %tr
-                  %td.project_name= link_to(word_break(remove_parent_name(project.name, @parent_name), 50), project_show_path(project))
-                  %td.project_title= word_break(project.title)
+          = render partial: 'subprojects_table', locals: { table_title: 'Sibling Project', project: @project, projects: @siblings }
 
 = render partial: 'add_new_subproject_modal', locals: { project: @project, configuration: @configuration }