Просмотр исходного кода

Merge pull request #899 from sharelatex/sk-account-delete-confirm-delete-sharelatex

Add another confirmation checkbox to account-delete.
James Allen 8 лет назад
Родитель
Сommit
29e9d5a1e6

+ 18 - 6
services/web/app/views/user/settings.pug

@@ -207,6 +207,7 @@ block content
 					focus-on="open",
 					ng-keyup="checkValidation()"
 				)
+
 				label #{translate('password')}
 				input.form-control(
 					type="password",
@@ -215,12 +216,23 @@ block content
 					ng-model="state.password",
 					ng-keyup="checkValidation()"
 				)
-				input(
-					type="checkbox"
-					ng-model="state.confirmV1Purge"
-					ng-change="checkValidation()"
-				)
-				label  I have left or purged my projects on Overleaf v1 (if any)  
+
+				div.confirmation-checkbox-wrapper
+					input(
+						type="checkbox"
+						ng-model="state.confirmV1Purge"
+						ng-change="checkValidation()"
+					).pull-left
+					label(style="display: inline")  I have left or purged my projects on Overleaf v1 (if any)  
+
+				div.confirmation-checkbox-wrapper
+					input(
+						type="checkbox"
+						ng-model="state.confirmSharelatexDelete"
+						ng-change="checkValidation()"
+					).pull-left
+					label(style="display: inline")  I understand this will delete all projects in my Overleaf v2 account (and ShareLaTeX account, if any) with email address #[em {{ userDefaultEmail }}]
+
 			div(ng-if="state.error")
 				div.alert.alert-danger
 					| #{translate('generic_something_went_wrong')}

+ 4 - 1
services/web/public/coffee/main/account-settings.coffee

@@ -43,17 +43,20 @@ define [
 				deleteText: ""
 				password: ""
 				confirmV1Purge: false
+				confirmSharelatexDelete: false
 				inflight: false
 				error: false
 				invalidCredentials: false
 
+			$scope.userDefaultEmail = userDefaultEmail
+
 			$modalInstance.opened.then () ->
 				$timeout () ->
 					$scope.$broadcast "open"
 				, 700
 
 			$scope.checkValidation = ->
-				$scope.state.isValid = userDefaultEmail? and $scope.state.deleteText == userDefaultEmail and $scope.state.password.length > 0 and $scope.state.confirmV1Purge
+				$scope.state.isValid = userDefaultEmail? and $scope.state.deleteText == userDefaultEmail and $scope.state.password.length > 0 and $scope.state.confirmV1Purge and $scope.state.confirmSharelatexDelete
 
 			$scope.delete = () ->
 				$scope.state.inflight = true

+ 6 - 0
services/web/public/stylesheets/app/account-settings.less

@@ -12,6 +12,12 @@
 		margin-top: 25px;
 		margin-bottom: 4px;
 	}
+	.confirmation-checkbox-wrapper {
+		padding-top: 8px;
+		input {
+			margin-right: 6px;
+		}
+	}
 }
 
 .affiliations-table {