Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into feature/issue3169
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisala committed Jan 10, 2025
2 parents 81ef8a5 + b93cf03 commit 78ed51b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions grails-app/views/shared/_reports.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<td><a data-bind="attr:{href:fcConfig.projectViewUrl+'/'+projectId}"><span data-bind="text:grantId"></span></a></td>
<td data-bind="text:associatedProgram"></td>
<td data-bind="text:associatedSubProgram"></td>
<td><a data-bind="attr:{href:fcConfig.projectViewUrl+'/'+projectId}"><span data-bind="text:name"></span></a></td>
<td>
<td class="project"><a data-bind="attr:{href:fcConfig.projectViewUrl+'/'+projectId}"><span data-bind="text:name"></span></a></td>
<td class="organisations">
<!-- ko foreach:currentAssociatedOrgs -->
<div class="organisationName">
<a data-bind="visible:ko.utils.unwrapObservable($data.organisationId),attr:{href:fcConfig.organisationLinkBaseUrl+'/'+ko.utils.unwrapObservable($data.organisationId)}">
Expand Down
2 changes: 1 addition & 1 deletion src/integration-test/groovy/pages/MyProjects.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class MyProjects extends Page {
}

List projectNames() {
projectTable.find('td span[data-bind*=name]').collect{it.text()}
projectTable.find('td.project [data-bind*=name]').collect{it.text()}
}
List managementUnitNames() {
managementUnits.find('li>a').collect{it.text()}
Expand Down

0 comments on commit 78ed51b

Please sign in to comment.