From a759828ece8bf87e41b88ee94178645746301d2c Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Fri, 6 Jul 2018 12:03:26 +0100
Subject: [PATCH] Update feature flag for affiliations; use it in the router;
 minor style adjustments.

---
 services/web/app/coffee/infrastructure/Features.coffee    | 2 +-
 services/web/app/coffee/router.coffee                     | 2 +-
 .../web/app/views/user/settings/user-affiliations.pug     | 8 ++++----
 .../factories/UserAffiliationsDataService.coffee          | 2 +-
 services/web/public/stylesheets/app/account-settings.less | 3 +++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/services/web/app/coffee/infrastructure/Features.coffee b/services/web/app/coffee/infrastructure/Features.coffee
index b17771f6f6..bf7d37d773 100644
--- a/services/web/app/coffee/infrastructure/Features.coffee
+++ b/services/web/app/coffee/infrastructure/Features.coffee
@@ -21,6 +21,6 @@ module.exports = Features =
 			when 'templates'
 				return !Settings.overleaf?
 			when 'affiliations'
-				return !(Settings.ldap? or Settings.saml?)
+				return settings?.apis?.v1?.url?
 			else
 				throw new Error("unknown feature: #{feature}")
diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee
index 2d9cce105d..4419dddac7 100644
--- a/services/web/app/coffee/router.coffee
+++ b/services/web/app/coffee/router.coffee
@@ -116,7 +116,7 @@ module.exports = class Router
 		webRouter.post '/user/emails/confirm',
 			UserEmailsController.confirm
 
-		unless Features.externalAuthenticationSystemUsed()
+		if Features.hasFeature 'affiliations'
 			webRouter.post '/user/emails',
 				AuthenticationController.requireLogin(),
 				UserEmailsController.add
diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug
index 3f4378155a..ef4c055dc7 100644
--- a/services/web/app/views/user/settings/user-affiliations.pug
+++ b/services/web/app/views/user/settings/user-affiliations.pug
@@ -36,7 +36,7 @@ form.row(
 								a(
 									href
 									ng-click="changeAffiliation(userEmail);"
-								)  #{translate("change")}
+								) #{translate("change")}
 								| )
 							.affiliation-change-container(
 								ng-if="isChangingAffiliation(userEmail.email)"
@@ -51,19 +51,19 @@ form.row(
 										href
 										ng-click="saveAffiliationChange();"
 									) #{translate("save_or_cancel-save")}
-									|  #{translate("save_or_cancel-or" )}
+									| &nbsp;#{translate("save_or_cancel-or" )}&nbsp;
 									a(
 										href
 										ng-click="cancelAffiliationChange();"
 									) #{translate("save_or_cancel-cancel")}
 					td 
-						a(
+						a.affiliations-table-inline-action(
 							href
 							ng-if="!userEmail.default"
 							ng-click="setDefaultUserEmail(userEmail)"
 						)  #{translate("make_default")}
 						br
-						a(
+						a.affiliations-table-inline-action(
 							href
 							ng-if="!userEmail.default"
 							ng-click="removeUserEmail(userEmail)"
diff --git a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee
index 2886cf779d..ae043bbda9 100644
--- a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee
+++ b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee
@@ -81,7 +81,7 @@ define [
 			}
 
 		addRoleAndDepartment = (email, role, department) ->
-			$http.post "/endorse", {
+			$http.post "/user/emails/endorse", {
 				email,
 				role,
 				department,
diff --git a/services/web/public/stylesheets/app/account-settings.less b/services/web/public/stylesheets/app/account-settings.less
index 439cf9c059..a27f9d6b8f 100644
--- a/services/web/public/stylesheets/app/account-settings.less
+++ b/services/web/public/stylesheets/app/account-settings.less
@@ -26,6 +26,9 @@
 	.affiliations-table-inline-actions {
 		width: 20%;
 	}
+		.affiliations-table-inline-action {
+			text-transform: capitalize;
+		}
 	.affiliations-table-highlighted-row {
 		background-color: tint(@content-alt-bg-color, 6%);
 	}