Skip to content

Commit

Permalink
Merge branch 'release/1.9.27' of https://github.com/akvo/akvo-flow in…
Browse files Browse the repository at this point in the history
…to release/1.9.27
  • Loading branch information
kymni committed Jan 25, 2018
2 parents 16b3fcb + c0dd427 commit f34a5ad
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,8 +1,8 @@
<tr>
<td class="device">{{view.dataPointRowNumber}}</td>
<td class="displayName" style="text-align:left;">{{item.displayName}}</td>
<td class="identifier" style="text-align:left;">{{item.identifier}}</td>
<td class="collected">{{#with item}}{{date1 lastUpdateDateTime}}{{/with}}</td>
<td class="displayName" style="text-align:left;">{{displayName}}</td>
<td class="identifier" style="text-align:left;">{{identifier}}</td>
<td class="collected">{{date1 lastUpdateDateTime}}</td>

{{#if view.parentView.showApprovalStatusColumn}}
<td class="approvalStatus">
Expand Down
4 changes: 2 additions & 2 deletions Dashboard/app/js/templates/navData/monitoring-data.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
</tr>
</thead>
<tbody>
{{#each item in FLOW.router.surveyedLocaleController.currentContents}}
{{view FLOW.DataPointView contentBinding="item"}}
{{#each FLOW.router.surveyedLocaleController.currentContents}}
{{view FLOW.DataPointView contentBinding="this"}}
{{/each}}
</tbody>
</table>
Expand Down

0 comments on commit f34a5ad

Please sign in to comment.