github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-30 07:05:19 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Henry Oswald 2015-10-19 15:44:54 +01:00
commit 0c74673e04
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
View file

@ -116,9 +116,11 @@ module.exports = ProjectEntityHandler =
return callback(err) if err? return callback(err) if err?
confirmFolder project, folder_id, (folder_id)=> confirmFolder project, folder_id, (folder_id)=>
doc = new Doc name: docName doc = new Doc name: docName
Project.putElement project._id, folder_id, doc, "doc", (err, result)=> # Put doc in docstore first, so that if it errors, we don't have a doc_id in the project
return callback(err) if err? # which hasn't been created in docstore.
DocstoreManager.updateDoc project._id.toString(), doc._id.toString(), docLines, (err, modified, rev) -> 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? return callback(err) if err?
tpdsUpdateSender.addDoc { tpdsUpdateSender.addDoc {
project_id: project._id, project_id: project._id,

4
services/web/app/views/subscriptions/group_admin.jade
View file

@ -5,7 +5,7 @@ block content
.container .container
.row .row
.col-md-10.col-md-offset-1 .col-md-10.col-md-offset-1
.card(ng-controller="GroupMembersController") .card(ng-controller="SubscriptionGroupMembersController")
.page-header .page-header
.pull-right(ng-cloak) .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>"})} 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")} span.header #{translate("registered")}
li.container-fluid( li.container-fluid(
ng-repeat="user in users | orderBy:'email':true", ng-repeat="user in users | orderBy:'email':true",
ng-controller="GroupMemberListItemController" ng-controller="SubscriptionGroupMemberListItemController"
) )
.row .row
.col-md-5 .col-md-5

4
services/web/public/coffee/main/group-members.coffee
View file

@ -1,7 +1,7 @@
define [ define [
"base" "base"
], (App) -> ], (App) ->
App.controller "GroupMembersController", ($scope, queuedHttp) -> App.controller "SubscriptionGroupMembersController", ($scope, queuedHttp) ->
$scope.users = window.users $scope.users = window.users
$scope.groupSize = window.groupSize $scope.groupSize = window.groupSize
$scope.selectedUsers = [] $scope.selectedUsers = []
@ -48,7 +48,7 @@ define [
$scope.updateSelectedUsers = () -> $scope.updateSelectedUsers = () ->
$scope.selectedUsers = $scope.users.filter (user) -> user.selected $scope.selectedUsers = $scope.users.filter (user) -> user.selected
App.controller "GroupMemberListItemController", ($scope) -> App.controller "SubscriptionGroupMemberListItemController", ($scope) ->
$scope.$watch "user.selected", (value) -> $scope.$watch "user.selected", (value) ->
if value? if value?
$scope.updateSelectedUsers() $scope.updateSelectedUsers()