Commit e23700de6203832bd7606a0e0d0667f72a0523ae
1 parent
9fa1eff6
Exists in
master
and in
2 other branches
Ticket #113: Show labels for profile fields when the user has no value for them
Showing
3 changed files
with
5 additions
and
5 deletions
Show diff stats
www/html/_edit_profile.html
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | <input type="text" placeholder="Nome" ng-model="profile.name" /> | 12 | <input type="text" placeholder="Nome" ng-model="profile.name" /> |
| 13 | </label> | 13 | </label> |
| 14 | 14 | ||
| 15 | - <ng-include src="'html/_signup_person_fields.html'"></ng-include> | 15 | + <ng-include src="'html/_signup_person_fields.html?1'"></ng-include> |
| 16 | 16 | ||
| 17 | <ng-include src="'html/_select_state.html'"></ng-include> | 17 | <ng-include src="'html/_select_state.html'"></ng-include> |
| 18 | </div> | 18 | </div> |
www/html/_signup_person_fields.html
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | Identidade de Gênero | 5 | Identidade de Gênero |
| 6 | </div> | 6 | </div> |
| 7 | <select ng-model="profile.identidade_genero" required class="item"> | 7 | <select ng-model="profile.identidade_genero" required class="item"> |
| 8 | - <option value="">Identidade de Gênero</option> | 8 | + <option value="" ng-selected="!profile.identidade_genero">Identidade de Gênero</option> |
| 9 | <option value="1">{{ 1 | generoFilter }}</option> | 9 | <option value="1">{{ 1 | generoFilter }}</option> |
| 10 | <option value="2">{{ 2 | generoFilter }}</option> | 10 | <option value="2">{{ 2 | generoFilter }}</option> |
| 11 | </select> | 11 | </select> |
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | Raça/Etnia | 29 | Raça/Etnia |
| 30 | </div> | 30 | </div> |
| 31 | <select ng-model="profile.etnia" required class="item" > | 31 | <select ng-model="profile.etnia" required class="item" > |
| 32 | - <option value="">Raça / Etnia</option> | 32 | + <option value="" ng-selected="!profile.etnia">Raça / Etnia</option> |
| 33 | <option value="1">{{ 1 | etniaFilter}}</option> | 33 | <option value="1">{{ 1 | etniaFilter}}</option> |
| 34 | <option value="2">{{ 2 | etniaFilter}}</option> | 34 | <option value="2">{{ 2 | etniaFilter}}</option> |
| 35 | <option value="3">{{ 3 | etniaFilter}}</option> | 35 | <option value="3">{{ 3 | etniaFilter}}</option> |
| @@ -45,7 +45,7 @@ | @@ -45,7 +45,7 @@ | ||
| 45 | Orientação Sexual | 45 | Orientação Sexual |
| 46 | </div> | 46 | </div> |
| 47 | <select ng-model="profile.orientacao_sexual" required class="item"> | 47 | <select ng-model="profile.orientacao_sexual" required class="item"> |
| 48 | - <option value="">Orientação Sexual</option> | 48 | + <option value="" ng-selected="!profile.orientacao_sexual">Orientação Sexual</option> |
| 49 | <option value="1">{{ 1 | orientacaoSexualFilter}}</option> | 49 | <option value="1">{{ 1 | orientacaoSexualFilter}}</option> |
| 50 | <option value="2">{{ 2 | orientacaoSexualFilter}}</option> | 50 | <option value="2">{{ 2 | orientacaoSexualFilter}}</option> |
| 51 | <option value="3">{{ 3 | orientacaoSexualFilter}}</option> | 51 | <option value="3">{{ 3 | orientacaoSexualFilter}}</option> |
www/js/controllers.js
| @@ -1315,7 +1315,7 @@ angular.module('confjuvapp.controllers', []) | @@ -1315,7 +1315,7 @@ angular.module('confjuvapp.controllers', []) | ||
| 1315 | } | 1315 | } |
| 1316 | 1316 | ||
| 1317 | if ($scope.signupPersonFields.length == 0) $scope.loadSignupPersonFields(); | 1317 | if ($scope.signupPersonFields.length == 0) $scope.loadSignupPersonFields(); |
| 1318 | - $ionicModal.fromTemplateUrl('html/_edit_profile.html', { | 1318 | + $ionicModal.fromTemplateUrl('html/_edit_profile.html?1', { |
| 1319 | scope: $scope, | 1319 | scope: $scope, |
| 1320 | animation: 'slide-in-up' | 1320 | animation: 'slide-in-up' |
| 1321 | }).then(function(modal) { | 1321 | }).then(function(modal) { |