From e7ba75c2e59fa7a9f86d4874efee33b5f9ec8d15 Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Tue, 6 Feb 2018 09:56:46 +0000
Subject: [PATCH] Don't show pop-up when changing link sharing status

---
 .../web/app/views/project/editor/share.pug    |  6 +-
 .../ShareProjectModalController.coffee        | 59 +++----------------
 2 files changed, 11 insertions(+), 54 deletions(-)

diff --git a/services/web/app/views/project/editor/share.pug b/services/web/app/views/project/editor/share.pug
index 98568df122..d96c14ba0e 100644
--- a/services/web/app/views/project/editor/share.pug
+++ b/services/web/app/views/project/editor/share.pug
@@ -16,7 +16,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate')
 					| &nbsp;&nbsp;
 					a(
 						href
-						ng-click="openMakeTokenBasedModal()"
+						ng-click="makeTokenBased()"
 					) #{translate('turn_on_link_sharing')}
 					span &nbsp;&nbsp;
 					a(
@@ -35,7 +35,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate')
 						| &nbsp;&nbsp;
 					a(
 						href
-						ng-click="openMakePrivateModal()"
+						ng-click="makePrivate()"
 					) #{translate('turn_off_link_sharing')}
 					span &nbsp;&nbsp;
 					a(
@@ -62,7 +62,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate')
 					| &nbsp;&nbsp;
 					a(
 						href
-						ng-click="openMakePrivateModal()"
+						ng-click="makePrivate()"
 					) #{translate("make_private")}
 
 			.row.project-member
diff --git a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee
index 0c16dcbb39..ce3f00fa01 100644
--- a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee
+++ b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee
@@ -1,7 +1,7 @@
 define [
 	"base"
 ], (App) ->
-	App.controller "ShareProjectModalController", ($scope, $modalInstance, $timeout, projectMembers, projectInvites, $modal, $http, ide, validateCaptcha) ->
+	App.controller "ShareProjectModalController", ($scope, $modalInstance, $timeout, projectMembers, projectInvites, $modal, $http, ide, validateCaptcha, settings, event_tracking) ->
 		$scope.inputs = {
 			privileges: "readAndWrite"
 			contacts: []
@@ -180,19 +180,14 @@ define [
 					$scope.state.error = "Sorry, something went wrong resending the invite :("
 					event.target.blur()
 
-		$scope.openMakePrivateModal = () ->
-			$modal.open {
-				templateUrl: "makePrivateModalTemplate"
-				controller:  "MakePrivateModalController"
-				scope: $scope
-			}
+		$scope.makeTokenBased = () ->
+			$scope.project.publicAccesLevel = "tokenBased"
+			settings.saveProjectAdminSettings({publicAccessLevel: "tokenBased"})
+			event_tracking.sendMB 'project-make-token-based'
 
-		$scope.openMakeTokenBasedModal = () ->
-			$modal.open {
-				templateUrl: "makeTokenBasedModalTemplate"
-				controller:  "MakeTokenBasedModalController"
-				scope: $scope
-			}
+		$scope.makePrivate = () ->
+			$scope.project.publicAccesLevel = "private"
+			settings.saveProjectAdminSettings({publicAccessLevel: "private"})
 
 		$scope.getReadAndWriteTokenLink = () ->
 			if $scope?.project?.tokens?.readAndWrite?
@@ -211,41 +206,3 @@ define [
 
 		$scope.cancel = () ->
 			$modalInstance.dismiss()
-
-
-
-	App.controller "MakePublicModalController", ["$scope", "$modalInstance", "settings", ($scope, $modalInstance, settings) ->
-		$scope.inputs = {
-			privileges: "readAndWrite"
-		}
-
-		$scope.makePublic = () ->
-			$scope.project.publicAccesLevel = $scope.inputs.privileges
-			settings.saveProjectAdminSettings({publicAccessLevel: $scope.inputs.privileges})
-			$modalInstance.close()
-
-		$scope.cancel = () ->
-			$modalInstance.dismiss()
-	]
-
-	App.controller "MakeTokenBasedModalController", ["$scope", "$modalInstance", "settings", "event_tracking", ($scope, $modalInstance, settings, event_tracking) ->
-
-		$scope.makeTokenBased = () ->
-			$scope.project.publicAccesLevel = "tokenBased"
-			settings.saveProjectAdminSettings({publicAccessLevel: "tokenBased"})
-			event_tracking.sendMB 'project-make-token-based'
-			$modalInstance.close()
-
-		$scope.cancel = () ->
-			$modalInstance.dismiss()
-	]
-
-	App.controller "MakePrivateModalController", ["$scope", "$modalInstance", "settings", ($scope, $modalInstance, settings) ->
-		$scope.makePrivate = () ->
-			$scope.project.publicAccesLevel = "private"
-			settings.saveProjectAdminSettings({publicAccessLevel: "private"})
-			$modalInstance.close()
-
-		$scope.cancel = () ->
-			$modalInstance.dismiss()
-	]
\ No newline at end of file