Commit ba097d6a374ad70c4435678ae593259292b1258d
Exists in
master
and in
4 other branches
Merge branch 'master' into staging
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
src/app/components/proposal-list/proposal-list.html
| @@ -11,10 +11,10 @@ | @@ -11,10 +11,10 @@ | ||
| 11 | </tr> | 11 | </tr> |
| 12 | </thead> | 12 | </thead> |
| 13 | <tbody> | 13 | <tbody> |
| 14 | - <tr ng-repeat="proposal in vm.proposals | orderBy:'ranking_position'"> | 14 | + <tr ng-repeat="proposal in vm.proposals | orderBy:['ranking_position','position']"> |
| 15 | <td class="color-theme-fg"> | 15 | <td class="color-theme-fg"> |
| 16 | - <span class="position">{{::proposal.ranking_position}}º</span> | ||
| 17 | - <!-- {{::proposal}} --> | 16 | + <span ng-show="proposal.ranking_position" class="position">{{::proposal.ranking_position}}º</span> |
| 17 | + <span ng-show="proposal.position" class="position">{{::proposal.position}}º</span> | ||
| 18 | </td> | 18 | </td> |
| 19 | <td> | 19 | <td> |
| 20 | <div class="row"> | 20 | <div class="row"> |