Skip to content

Commit

Permalink
Merge pull request #6533 from bgeuken/rename_subprojects_table_partial
Browse files Browse the repository at this point in the history
Rename the subprojects_table partial to projects_table
  • Loading branch information
ChrisBr committed Dec 10, 2018
2 parents 886a36c + 1e4492f commit dbbf5ce
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%h3 #{table_title.pluralize} of #{project}
%table.responsive.table.table-sm.table-striped.table-bordered.subproject-table
%table.responsive.table.table-sm.table-striped.table-bordered.projects-table
%thead
%tr
%th= table_title
Expand Down
8 changes: 4 additions & 4 deletions src/api/app/views/webui2/webui/project/subprojects.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
.row
.col-md-12
- if @parentprojects.present?
= render partial: 'subprojects_table', locals: { table_title: 'Parent Project', project: @project, projects: @parentprojects }
= render partial: 'projects_table', locals: { table_title: 'Parent Project', project: @project, projects: @parentprojects }
.row{ class: ('mt-3' if @parentprojects.present?) }
.col-md-12
- if @subprojects.present?
= render partial: 'subprojects_table', locals: { table_title: 'Subproject', project: @project, projects: @subprojects }
= render partial: 'projects_table', locals: { table_title: 'Subproject', project: @project, projects: @subprojects }
- else
%p
%i This project has no subprojects
Expand All @@ -22,9 +22,9 @@
.row.mt-3
.col-md-12
- if @siblings.present?
= render partial: 'subprojects_table', locals: { table_title: 'Sibling Project', project: @project, projects: @siblings }
= render partial: 'projects_table', locals: { table_title: 'Sibling Project', project: @project, projects: @siblings }

= render partial: 'add_new_subproject_modal', locals: { project: @project, configuration: @configuration }

:javascript
initializeDataTable('.subproject-table');
initializeDataTable('.projects-table');

0 comments on commit dbbf5ce

Please sign in to comment.