Merge pull request #854 from sharelatex/ta-affiliations-ui-improvements

Affiliations UI Improvements
This commit is contained in:
Timothée Alby 2018-08-28 14:03:08 +02:00 committed by GitHub
commit c696ec2688

View file

@ -26,6 +26,8 @@ form.row(
href,
ng-click="resendConfirmationEmail(userEmail)"
) #{translate('resend_confirmation_email')}
div(ng-if="userEmail.confirmedAt && userEmail.affiliation.institution && userEmail.affiliation.institution.confirmed && userEmail.affiliation.institution.licence != 'free'").small
span.label.label-primary #{translate("professional")}
td
div(ng-if="userEmail.affiliation.institution")
div {{ userEmail.affiliation.institution.name }}
@ -55,9 +57,9 @@ form.row(
show-role-and-department="true"
)
.affiliation-change-actions.small
a(
href
button.btn.btn-sm.btn-success(
ng-click="saveAffiliationChange(userEmail);"
ng-disabled="!(affiliationToChange.role && affiliationToChange.department)"
) #{translate("save_or_cancel-save")}
|  #{translate("save_or_cancel-or" )} 
a(