Merge branch 'hotfix/2.9.8'

getslash · Aug 6, 2017 · 0c7a6d9 · 0c7a6d9
2 parents 6ac1b5a + 18a3c0b
commit 0c7a6d9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 4 deletions.
diff --git a/webapp/app/components/query-results/component.js b/webapp/app/components/query-results/component.js
@@ -2,6 +2,7 @@ import Ember from "ember";
 
 export default Ember.Component.extend({
   results: null,
+  meta: null,
   show_subjects: true,
   show_users: true,
   session_model: null,

diff --git a/webapp/app/components/query-results/template.hbs b/webapp/app/components/query-results/template.hbs
@@ -1,4 +1,4 @@
-{{pagination-nav page=(mut page) has_next=results.meta.has_more num_pages=results.meta.num_pages }}
+{{pagination-nav page=(mut page) has_next=meta.has_more num_pages=meta.num_pages }}
 
 {{#each results as |result|}}
   {{component (concat result.type "-item") item=result show_subjects=show_subjects  session_model=session_model show_user=show_users}}
@@ -8,4 +8,4 @@
   </div>
 {{/each}}
 
-{{pagination-nav page=(mut page) has_next=results.meta.has_more num_pages=results.meta.num_pages }}
+{{pagination-nav page=(mut page) has_next=meta.has_more num_pages=meta.num_pages }}
diff --git a/webapp/app/session/children/template.hbs b/webapp/app/session/children/template.hbs
@@ -1,5 +1,6 @@
 {{query-results
   results=sortedModel
+  meta=children.meta
   page=(mut page)
   page_size=(mut page_size)
   show_successful=show_successful

diff --git a/webapp/app/session/index/template.hbs b/webapp/app/session/index/template.hbs
@@ -1,4 +1,6 @@
-{{query-results results=sortedTests page=(mut page)
+{{query-results
+  results=sortedTests
+  page=(mut page)
   show_users=false
   page_size=(mut page_size)
   show_subjects=false
@@ -8,4 +10,5 @@
   show_skipped=show_skipped
   show_planned=show_planned
   session_model=session_model
+  meta=collection.meta
 }}
diff --git a/webapp/app/sessions/template.hbs b/webapp/app/sessions/template.hbs
@@ -57,6 +57,7 @@
 {{else}}
   {{query-results
     results=sessions
+    meta=sessions.meta
     page=(mut page)
     page_size=(mut page_size)
     show_successful=show_successful

diff --git a/webapp/app/subject/template.hbs b/webapp/app/subject/template.hbs
@@ -10,6 +10,7 @@
 {{hr-separator title="Sessions"}}
 
 {{query-results results=sessions
+  meta=sessions.meta
   page=(mut page)
   page_size=(mut page_size)
   show_successful=(mut show_successful)

diff --git a/webapp/app/tests/template.hbs b/webapp/app/tests/template.hbs
@@ -57,5 +57,5 @@
     </div>
   </div>
 {{else}}
-  {{query-results results=tests page=(mut page) show_user=true}}
+  {{query-results results=tests meta=tests.meta page=(mut page) show_user=true}}
 {{/if}}