Fixed race and renamed column for #1980

AtlasOfLivingAustralia · Sep 17, 2024 · af23b9d · af23b9d
1 parent 8139b7d
commit af23b9d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/grails-app/assets/javascripts/my-projects.js b/grails-app/assets/javascripts/my-projects.js
@@ -179,7 +179,11 @@ var ProjectReportingViewModel = function (projects, options) {
             return new ProjectReportsViewModel(prj.project);
         });
         self.projects(mappedProjects);
-        $(options.tableSelector).DataTable({displayLength:50, order:[[6,'desc']]});
+        // We need the projects to be rendered in the table before attaching the DataTable to it
+        setTimeout(function() {
+            $(options.tableSelector).DataTable({displayLength:50, order:[[6,'desc']]});
+        }, 0);
+
     }
     if (projects.length == 0) {
         $.get(options.userProjectsUrl).done(function (projects) {

diff --git a/grails-app/views/shared/_reports.gsp b/grails-app/views/shared/_reports.gsp
@@ -2,7 +2,7 @@
 <table id="report" class="table">
     <thead>
         <tr>
-            <th class="sorting">Grant ID</th>
+            <th class="sorting">MERIT Project ID</th>
             <th class="sorting">Programme</th>
             <th class="sorting">Sub-programme</th>
             <th class="sorting" width="30%">Project name</th>