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

Also refactor signatures from methods wrapping the HTTP service.

Paulo Reis 9 лет назад
Родитель
Сommit
669c705d32

+ 6 - 4
services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee

@@ -66,8 +66,9 @@ define [
 					.then () ->
 					.then () ->
 						$scope.state.inflight = false
 						$scope.state.inflight = false
 						$modalInstance.close()
 						$modalInstance.close()
-					.catch (e)->
-						$scope.error = e
+					.catch (response)->
+						{ data } = response
+						$scope.error = data
 
 
 			$scope.cancel = () ->
 			$scope.cancel = () ->
 				$modalInstance.dismiss('cancel')
 				$modalInstance.dismiss('cancel')
@@ -98,8 +99,9 @@ define [
 					.then () ->
 					.then () ->
 						$scope.state.inflight = false
 						$scope.state.inflight = false
 						$modalInstance.close()
 						$modalInstance.close()
-					.catch (e)->
-						$scope.error = e
+					.catch (response)->
+						{ data } = response
+						$scope.error = data
 						$scope.state.inflight = false
 						$scope.state.inflight = false
 
 
 			$scope.cancel = () ->
 			$scope.cancel = () ->

+ 4 - 4
services/web/public/coffee/ide/settings/controllers/ProjectNameController.coffee

@@ -24,13 +24,13 @@ define [
 			oldName = $scope.project.name
 			oldName = $scope.project.name
 			$scope.project.name = newName
 			$scope.project.name = newName
 			settings.saveProjectSettings({name: $scope.project.name})
 			settings.saveProjectSettings({name: $scope.project.name})
-				.catch (response, statusCode) ->
+				.catch (response) ->
+					{ data, status } = response
 					$scope.project.name = oldName
 					$scope.project.name = oldName
-					if statusCode == 400
-						ide.showGenericMessageModal("Error renaming project", response)
+					if status == 400
+						ide.showGenericMessageModal("Error renaming project", data)
 					else
 					else
 						ide.showGenericMessageModal("Error renaming project", "Please try again in a moment")
 						ide.showGenericMessageModal("Error renaming project", "Please try again in a moment")
-					console.log arguments
 
 
 		ide.socket.on "projectNameUpdated", (name) ->
 		ide.socket.on "projectNameUpdated", (name) ->
 			$scope.$apply () ->
 			$scope.$apply () ->

+ 10 - 8
services/web/public/coffee/ide/share/controllers/ShareController.coffee

@@ -15,16 +15,18 @@ define [
 			ide.socket.on 'project:membership:changed', (data) =>
 			ide.socket.on 'project:membership:changed', (data) =>
 				if data.members
 				if data.members
 					projectMembers.getMembers()
 					projectMembers.getMembers()
-						.then (responseData) =>
-							if responseData.members
-								$scope.project.members = responseData.members
-						.catch (responseDate) =>
+						.then (response) =>
+							{ data } = response
+							if data.members
+								$scope.project.members = data.members
+						.catch () =>
 							console.error "Error fetching members for project"
 							console.error "Error fetching members for project"
 				if data.invites
 				if data.invites
 					projectInvites.getInvites()
 					projectInvites.getInvites()
-						.then (responseData) =>
-							if responseData.invites
-								$scope.project.invites = responseData.invites
-						.catch (responseDate) =>
+						.then (response) =>
+							{ data } = response
+							if data.invites
+								$scope.project.invites = data.invites
+						.catch () =>
 							console.error "Error fetching invites for project"
 							console.error "Error fetching invites for project"
 	]
 	]

+ 2 - 1
services/web/public/coffee/main/group-members.coffee

@@ -26,7 +26,8 @@ define [
 						email: email,
 						email: email,
 						_csrf: window.csrfToken
 						_csrf: window.csrfToken
 					})
 					})
-					.then (data) ->
+					.then (response) ->
+						{ data } = response
 						$scope.users.push data.user if data.user?
 						$scope.users.push data.user if data.user?
 						$scope.inputs.emails = ""
 						$scope.inputs.emails = ""
 
 

+ 14 - 10
services/web/public/coffee/main/project-list/modal-controllers.coffee

@@ -23,10 +23,11 @@ define [
 					$scope.state.inflight = false
 					$scope.state.inflight = false
 					$scope.state.error = false
 					$scope.state.error = false
 					$modalInstance.close()
 					$modalInstance.close()
-				.catch (body, statusCode) ->
+				.catch (response) ->
+					{ data, status } = response
 					$scope.state.inflight = false
 					$scope.state.inflight = false
-					if statusCode == 400
-						$scope.state.error = { message: body }
+					if status == 400
+						$scope.state.error = { message: data }
 					else
 					else
 						$scope.state.error = true
 						$scope.state.error = true
 
 
@@ -53,10 +54,11 @@ define [
 					$scope.state.inflight = false
 					$scope.state.inflight = false
 					$scope.state.error = false
 					$scope.state.error = false
 					$modalInstance.close()
 					$modalInstance.close()
-				.catch (body, statusCode) ->
+				.catch (response) ->
+					{ data, status } = response
 					$scope.state.inflight = false
 					$scope.state.inflight = false
-					if statusCode == 400
-						$scope.state.error = { message: body }
+					if status == 400
+						$scope.state.error = { message: data }
 					else
 					else
 						$scope.state.error = true
 						$scope.state.error = true
 
 
@@ -80,14 +82,16 @@ define [
 			$scope.state.error = false
 			$scope.state.error = false
 			$scope
 			$scope
 				.createProject($scope.inputs.projectName, template)
 				.createProject($scope.inputs.projectName, template)
-				.then (data) ->
+				.then (response) ->
+					{ data } = response
 					$scope.state.inflight = false
 					$scope.state.inflight = false
 					$scope.state.error = false
 					$scope.state.error = false
 					$modalInstance.close(data.project_id)
 					$modalInstance.close(data.project_id)
-				.catch (body, statusCode) ->
+				.catch (response) ->
+					{ data, status } = response
 					$scope.state.inflight = false
 					$scope.state.inflight = false
-					if statusCode == 400
-						$scope.state.error = { message: body }
+					if status == 400
+						$scope.state.error = { message: data }
 					else
 					else
 						$scope.state.error = true
 						$scope.state.error = true
 
 

+ 4 - 3
services/web/public/coffee/main/project-list/project-list.coffee

@@ -262,8 +262,8 @@ define [
 					projectName: name
 					projectName: name
 					template: template
 					template: template
 				})
 				})
-				.then((data, status, headers, config) ->
-					console.log data, status, headers, config
+				.then((response) ->
+					{ data } = response
 					$scope.projects.push {
 					$scope.projects.push {
 						name: name
 						name: name
 						_id: data.project_id
 						_id: data.project_id
@@ -314,7 +314,8 @@ define [
 					_csrf: window.csrfToken
 					_csrf: window.csrfToken
 					projectName: cloneName
 					projectName: cloneName
 				})
 				})
-				.then((data, status, headers, config) ->
+				.then((response) ->
+					{ data } = response
 					$scope.projects.push {
 					$scope.projects.push {
 						name: cloneName
 						name: cloneName
 						id: data.project_id
 						id: data.project_id

+ 3 - 1
services/web/public/coffee/main/register-users.coffee

@@ -25,7 +25,9 @@ define [
 						email: email,
 						email: email,
 						_csrf: window.csrfToken
 						_csrf: window.csrfToken
 					})
 					})
-					.then (user) ->
+					.then (response) ->
+						{ data } = response
+						user = data
 						$scope.users.push user
 						$scope.users.push user
 						$scope.inputs.emails = ""
 						$scope.inputs.emails = ""
 					.catch () ->
 					.catch () ->