Merge branch 'master' into hotfix-ticketAddresFk
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
5b587b3449
|
@ -38,7 +38,7 @@
|
|||
</vn-label-value>
|
||||
<vn-label-value
|
||||
label="Extension"
|
||||
>
|
||||
>
|
||||
<vn-link-phone
|
||||
phone-number="$ctrl.worker.sip.extension"
|
||||
></vn-link-phone>
|
||||
|
@ -61,8 +61,6 @@
|
|||
</div>
|
||||
<div ng-transclude="btnTwo">
|
||||
<vn-quick-link
|
||||
vn-acl="hr"
|
||||
vn-acl-action="remove"
|
||||
tooltip="Go to user"
|
||||
state="['account.card.summary', {id: $ctrl.id}]"
|
||||
icon="face">
|
||||
|
@ -75,13 +73,13 @@
|
|||
<vn-popup vn-id="summary">
|
||||
<vn-worker-summary worker="$ctrl.worker"></vn-worker-summary>
|
||||
</vn-popup>
|
||||
<vn-dialog
|
||||
<vn-dialog
|
||||
vn-id="setPassword"
|
||||
on-accept="$ctrl.setPassword($ctrl.worker.password)"
|
||||
message="Reset password"
|
||||
>
|
||||
<tpl-body>
|
||||
<vn-textfield
|
||||
<vn-textfield
|
||||
vn-one
|
||||
label="New password"
|
||||
required="true"
|
||||
|
|
Loading…
Reference in New Issue