Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

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	

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:"<strong>{{ users.length }}</strong>", groupSize:"<strong>{{ groupSize }}</strong>"})}
@@ -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

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()