fixed automerge
gitea/salix/master This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-09-19 10:52:23 +02:00
parent f67006e526
commit d6d825ebf1
1 changed files with 35 additions and 46 deletions

View File

@ -18,52 +18,41 @@
ng-class="{ ng-class="{
'item-hightlight': $ctrl.isDefaultAddress(address), 'item-hightlight': $ctrl.isDefaultAddress(address),
'item-disabled': !address.isActive && !$ctrl.isDefaultAddress(address) 'item-disabled': !address.isActive && !$ctrl.isDefaultAddress(address)
}" }">
translate-attr="{title: 'Edit address'}" <vn-horizontal style="align-items: center;">
border-radius> <vn-none pad-medium-h>
<vn-none <vn-icon-button
pad-small-right icon="star"
ng-click="$ctrl.onStarClick($event)"> ng-if="$ctrl.isDefaultAddress(address)">
<vn-icon-button </vn-icon-button>
icon="star" <vn-icon-button
ng-if="$ctrl.isDefaultAddress(address)"> ng-if="!address.isActive && !$ctrl.isDefaultAddress(address)"
</vn-icon-button> icon="star_border"
<vn-icon-button vn-tooltip="Active first to set as default">
ng-if="!address.isActive && !$ctrl.isDefaultAddress(address)" </vn-icon-button>
icon="star_border" <vn-icon-button
vn-tooltip="Active first to set as default"> ng-if="address.isActive && !$ctrl.isDefaultAddress(address)"
</vn-icon-button> icon="star_border"
<vn-icon-button vn-tooltip="Set as default"
ng-if="address.isActive && !$ctrl.isDefaultAddress(address)" ng-click="$ctrl.setDefault(address)">
icon="star_border" </vn-icon-button>
vn-tooltip="Set as default" </vn-none>
ng-click="$ctrl.setDefault(address)"> <vn-one border-solid-right>
</vn-icon-button> <vn-horizontal>
</vn-none> <vn-one>
<vn-one <div><b>{{::address.nickname}}</b></div>
style="overflow: hidden; min-width: 14em;"> <div name="street">{{::address.street}}</div>
<div class="ellipsize"><b>{{::address.nickname}}</b></div> <div>{{::address.city}}, {{::address.province}}</div>
<div class="ellipsize" name="street">{{::address.street}}</div> <div>{{::address.phone}}, {{::address.mobile}}</div>
<div class="ellipsize">{{::address.city}}, {{::address.province.name}}</div> </vn-one>
<div class="ellipsize"> <vn-one>
{{::address.phone}}<span ng-if="::address.mobile">, </span> <vn-check
{{::address.mobile}} vn-one label="Is equalizated"
</div> field="address.isEqualizated"
<vn-check disabled="true">
vn-one label="Is equalizated" </vn-check>
field="address.isEqualizated" </vn-one>
disabled="true"> </vn-horizontal>
</vn-check>
</vn-one>
<vn-vertical
vn-one
ng-if="address.observations.length"
border-solid-left
pad-medium-h
style="height: 6em; overflow: auto;">
<vn-one ng-repeat="observation in address.observations track by $index" ng-class="{'pad-small-top': $index}">
<b>{{::observation.observationType.description}}:</b>
<span>{{::observation.description}}</span>
</vn-one> </vn-one>
<vn-vertical vn-one pad-medium-h> <vn-vertical vn-one pad-medium-h>
<vn-one ng-repeat="observation in address.observations track by $index" ng-class="{'pad-small-top': $index}"> <vn-one ng-repeat="observation in address.observations track by $index" ng-class="{'pad-small-top': $index}">