diff --git a/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee b/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee index a7a0528cd9..28964b9090 100644 --- a/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee +++ b/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee @@ -66,8 +66,9 @@ define [ .then () -> $scope.state.inflight = false $modalInstance.close() - .catch (e)-> - $scope.error = e + .catch (response)-> + { data } = response + $scope.error = data $scope.cancel = () -> $modalInstance.dismiss('cancel') @@ -98,8 +99,9 @@ define [ .then () -> $scope.state.inflight = false $modalInstance.close() - .catch (e)-> - $scope.error = e + .catch (response)-> + { data } = response + $scope.error = data $scope.state.inflight = false $scope.cancel = () -> diff --git a/services/web/public/coffee/ide/settings/controllers/ProjectNameController.coffee b/services/web/public/coffee/ide/settings/controllers/ProjectNameController.coffee index 26bf523a20..b70b8fc89c 100644 --- a/services/web/public/coffee/ide/settings/controllers/ProjectNameController.coffee +++ b/services/web/public/coffee/ide/settings/controllers/ProjectNameController.coffee @@ -24,13 +24,13 @@ define [ oldName = $scope.project.name $scope.project.name = newName settings.saveProjectSettings({name: $scope.project.name}) - .catch (response, statusCode) -> + .catch (response) -> + { data, status } = response $scope.project.name = oldName - if statusCode == 400 - ide.showGenericMessageModal("Error renaming project", response) + if status == 400 + ide.showGenericMessageModal("Error renaming project", data) else ide.showGenericMessageModal("Error renaming project", "Please try again in a moment") - console.log arguments ide.socket.on "projectNameUpdated", (name) -> $scope.$apply () -> diff --git a/services/web/public/coffee/ide/share/controllers/ShareController.coffee b/services/web/public/coffee/ide/share/controllers/ShareController.coffee index bc835e8873..1ac3bf8709 100644 --- a/services/web/public/coffee/ide/share/controllers/ShareController.coffee +++ b/services/web/public/coffee/ide/share/controllers/ShareController.coffee @@ -15,16 +15,18 @@ define [ ide.socket.on 'project:membership:changed', (data) => if data.members 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" if data.invites 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" ] diff --git a/services/web/public/coffee/main/group-members.coffee b/services/web/public/coffee/main/group-members.coffee index 9305ecd3a3..813ad4c768 100644 --- a/services/web/public/coffee/main/group-members.coffee +++ b/services/web/public/coffee/main/group-members.coffee @@ -26,7 +26,8 @@ define [ email: email, _csrf: window.csrfToken }) - .then (data) -> + .then (response) -> + { data } = response $scope.users.push data.user if data.user? $scope.inputs.emails = "" diff --git a/services/web/public/coffee/main/project-list/modal-controllers.coffee b/services/web/public/coffee/main/project-list/modal-controllers.coffee index f78da890b7..179e0d91ce 100644 --- a/services/web/public/coffee/main/project-list/modal-controllers.coffee +++ b/services/web/public/coffee/main/project-list/modal-controllers.coffee @@ -23,10 +23,11 @@ define [ $scope.state.inflight = false $scope.state.error = false $modalInstance.close() - .catch (body, statusCode) -> + .catch (response) -> + { data, status } = response $scope.state.inflight = false - if statusCode == 400 - $scope.state.error = { message: body } + if status == 400 + $scope.state.error = { message: data } else $scope.state.error = true @@ -53,10 +54,11 @@ define [ $scope.state.inflight = false $scope.state.error = false $modalInstance.close() - .catch (body, statusCode) -> + .catch (response) -> + { data, status } = response $scope.state.inflight = false - if statusCode == 400 - $scope.state.error = { message: body } + if status == 400 + $scope.state.error = { message: data } else $scope.state.error = true @@ -80,14 +82,16 @@ define [ $scope.state.error = false $scope .createProject($scope.inputs.projectName, template) - .then (data) -> + .then (response) -> + { data } = response $scope.state.inflight = false $scope.state.error = false $modalInstance.close(data.project_id) - .catch (body, statusCode) -> + .catch (response) -> + { data, status } = response $scope.state.inflight = false - if statusCode == 400 - $scope.state.error = { message: body } + if status == 400 + $scope.state.error = { message: data } else $scope.state.error = true diff --git a/services/web/public/coffee/main/project-list/project-list.coffee b/services/web/public/coffee/main/project-list/project-list.coffee index ff33921c06..5d0341656e 100644 --- a/services/web/public/coffee/main/project-list/project-list.coffee +++ b/services/web/public/coffee/main/project-list/project-list.coffee @@ -262,8 +262,8 @@ define [ projectName: name template: template }) - .then((data, status, headers, config) -> - console.log data, status, headers, config + .then((response) -> + { data } = response $scope.projects.push { name: name _id: data.project_id @@ -314,7 +314,8 @@ define [ _csrf: window.csrfToken projectName: cloneName }) - .then((data, status, headers, config) -> + .then((response) -> + { data } = response $scope.projects.push { name: cloneName id: data.project_id diff --git a/services/web/public/coffee/main/register-users.coffee b/services/web/public/coffee/main/register-users.coffee index 7c99907953..42b082d876 100644 --- a/services/web/public/coffee/main/register-users.coffee +++ b/services/web/public/coffee/main/register-users.coffee @@ -25,7 +25,9 @@ define [ email: email, _csrf: window.csrfToken }) - .then (user) -> + .then (response) -> + { data } = response + user = data $scope.users.push user $scope.inputs.emails = "" .catch () ->