use job_title instead of job

This commit is contained in:
Davide Alberani 2015-04-25 10:06:35 +02:00
parent 94fbfef6cf
commit 3ad75be5ff
3 changed files with 4 additions and 4 deletions

View file

@ -60,7 +60,7 @@
<tr ng-repeat="person in event.persons | splittedFilter:query | orderBy:personsOrderProp">
<td>
<span><strong><a ui-sref="person.info({id: person.person_id})"><span>{{person.name}}</span>&nbsp;<span>{{person.surname}}</span></a></strong></span><span ng-if="person.email">&nbsp;&lt;{{person.email}}&gt;</span>
<p ng-if="person.company || person.job"><i ng-if="person.job">{{person.job}}</i><span ng-if="person.company && person.job">&nbsp;@&nbsp;</span><i ng-if="person.company">{{person.company}}</i></p>
<p ng-if="person.company || person.job_title"><i ng-if="person.job_title">{{person.job_title}}</i><span ng-if="person.company && person.job_title">&nbsp;@&nbsp;</span><i ng-if="person.company">{{person.company}}</i></p>
</td>
<td>
<button class="btn btn-link" reset-focus name="switch-attended" ng-click="setPersonAttributeAndRefocus(person, 'attended', !person.attended)"><span class="glyphicon {{(person.attended) && 'glyphicon-ok-sign text-success' || 'glyphicon-remove-sign text-danger'}}"></span></button>
@ -107,7 +107,7 @@
</div>
<div class="input-group top5">
<span class="input-group-addon">{{'Job' | translate}}</span>
<input name="job" class="form-control" placeholder="{{'Evil Ruler' | translate}}" ng-model="newPerson.job">
<input name="job_title" class="form-control" placeholder="{{'Evil Ruler' | translate}}" ng-model="newPerson.job_title">
</div>
<button reset-focus ng-disabled="!(newPerson.name && newPerson.surname)" ng-click="fastAddPerson(newPerson, true)" class="btn btn-success top5">

View file

@ -34,7 +34,7 @@
<div class="input-group top5">
<span class="input-group-addon">{{'Job' | translate}}</span>
<input name="job" class="form-control" placeholder="{{'Evil Ruler' | translate}}" ng-model="person.job">
<input name="job_title" class="form-control" placeholder="{{'Evil Ruler' | translate}}" ng-model="person.job_title">
</div>
<div class="form-group top5">

View file

@ -55,7 +55,7 @@
<tr ng-repeat="person in persons | splittedFilter:query | orderBy:personsOrderProp">
<td>
<span><strong><a ui-sref="person.info({id: person._id})"><span>{{person.name}}</span>&nbsp;<span>{{person.surname}}</span></a></strong></span><span ng-if="person.email">&nbsp;&lt;{{person.email}}&gt;</span>
<p ng-if="person.company || person.job"><i ng-if="person.job">{{person.job}}</i><span ng-if="person.company && person.job">&nbsp;@&nbsp;</span><i ng-if="person.company">{{person.company}}</i></p>
<p ng-if="person.company || person.job_title"><i ng-if="person.job_title">{{person.job_title}}</i><span ng-if="person.company && person.job_title">&nbsp;@&nbsp;</span><i ng-if="person.company">{{person.company}}</i></p>
</td>
<td ng-repeat="col in customFields">
<span ng-if="col.type == 'boolean'">