From 64ffcde3dfc48c52251f4567c37b9634301392c8 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 5 Oct 2015 16:36:56 +0100 Subject: [PATCH 1/2] Namespace subscription groups as SubscriptionGroup --- services/web/app/views/subscriptions/group_admin.jade | 4 ++-- services/web/public/coffee/main/group-members.coffee | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/web/app/views/subscriptions/group_admin.jade b/services/web/app/views/subscriptions/group_admin.jade index 3ed9974480..39312fd57a 100644 --- a/services/web/app/views/subscriptions/group_admin.jade +++ b/services/web/app/views/subscriptions/group_admin.jade @@ -5,7 +5,7 @@ block content .container .row .col-md-10.col-md-offset-1 - .card(ng-controller="GroupMembersController") + .card(ng-controller="SubscriptionGroupMembersController") .page-header .pull-right(ng-cloak) small(ng-show="selectedUsers.length == 0") !{translate("you_have_added_x_of_group_size_y", {addedUsersSize:"{{ users.length }}", groupSize:"{{ groupSize }}"})} @@ -35,7 +35,7 @@ block content span.header #{translate("registered")} li.container-fluid( ng-repeat="user in users | orderBy:'email':true", - ng-controller="GroupMemberListItemController" + ng-controller="SubscriptionGroupMemberListItemController" ) .row .col-md-5 diff --git a/services/web/public/coffee/main/group-members.coffee b/services/web/public/coffee/main/group-members.coffee index f1f61623ee..e28dfc67ce 100644 --- a/services/web/public/coffee/main/group-members.coffee +++ b/services/web/public/coffee/main/group-members.coffee @@ -1,7 +1,7 @@ define [ "base" ], (App) -> - App.controller "GroupMembersController", ($scope, queuedHttp) -> + App.controller "SubscriptionGroupMembersController", ($scope, queuedHttp) -> $scope.users = window.users $scope.groupSize = window.groupSize $scope.selectedUsers = [] @@ -48,7 +48,7 @@ define [ $scope.updateSelectedUsers = () -> $scope.selectedUsers = $scope.users.filter (user) -> user.selected - App.controller "GroupMemberListItemController", ($scope) -> + App.controller "SubscriptionGroupMemberListItemController", ($scope) -> $scope.$watch "user.selected", (value) -> if value? $scope.updateSelectedUsers() \ No newline at end of file From 36678301e6bd4f017ac9d2518f10fcfdc0641491 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 16 Oct 2015 12:34:33 +0100 Subject: [PATCH 2/2] Try to put a new doc in the docstore first so that if it fails it doesn't leave a broken doc_id in the project --- .../Features/Project/ProjectEntityHandler.coffee | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee index 1ac7d78918..d7f2f51ef8 100644 --- a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee +++ b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee @@ -116,10 +116,12 @@ module.exports = ProjectEntityHandler = return callback(err) if err? confirmFolder project, folder_id, (folder_id)=> doc = new Doc name: docName - Project.putElement project._id, folder_id, doc, "doc", (err, result)=> - return callback(err) if err? - DocstoreManager.updateDoc project._id.toString(), doc._id.toString(), docLines, (err, modified, rev) -> - return callback(err) if err? + # Put doc in docstore first, so that if it errors, we don't have a doc_id in the project + # which hasn't been created in docstore. + DocstoreManager.updateDoc project._id.toString(), doc._id.toString(), docLines, (err, modified, rev) -> + return callback(err) if err? + Project.putElement project._id, folder_id, doc, "doc", (err, result)=> + return callback(err) if err? tpdsUpdateSender.addDoc { project_id: project._id, doc_id: doc._id