taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #925 from taigaio/refactor-project-restrictions 

Refactor project restrictions
stable
Juanfran 2016-03-17 10:20:47 +01:00
parent 8e0a10266c 2798fd117a
commit e6c02202f5
8 changed files with 23 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/coffee/modules/admin/memberships.coffee
View File

@ -48,12 +48,11 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
"$tgAnalytics",
"tgAppMetaService",
"$translate",
"tgCurrentUserService",
"$tgAuth"
]
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @navUrls, @analytics,
@appMetaService, @translate, @currentUserService, @tgAuth) ->
@appMetaService, @translate, @tgAuth) ->
bindMethods(@)
@scope.project = {}
@ -112,15 +111,8 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
@rootscope.$broadcast("membersform:new")
_checkUsersLimit: ->
@scope.canAddUsers = true
userData = @currentUserService.getUser().toJS()
if @currentUserService.canAddMoreMembersInPrivateProjects(@scope.projectId).valid == false
@.maxMembers = userData.max_members_private_projects
@scope.canAddUsers = false
else if @currentUserService.canAddMoreMembersInPublicProjects(@scope.projectId).valid == false
@.maxMembers = userData.max_members_public_projects
@scope.canAddUsers = false
@scope.canAddUsers = @.project.get('total_memberships') > @.project.get('max_memberships')
@.maxMembers = @.project.get('max_memberships')
limitUsersWarning: ->
title = @translate.instant("ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING")

8
app/coffee/modules/admin/project-profile.coffee
View File

@ -69,11 +69,6 @@ class ProjectProfileController extends mixOf(taiga.Controller, taiga.PageMixin)
description = @scope.project.description
@appMetaService.setAll(title, description)
@scope.canBePrivateProject = @.currentUserService.canBePrivateProject(@scope.project.id)
@scope.canBePublicProject = @.currentUserService.canBePublicProject(@scope.project.id)
@scope.isPrivateProject = @scope.project.is_private
promise.then null, @.onInitialDataError.bind(@)
@scope.$on "project:loaded", =>
@ -534,8 +529,7 @@ module.directive('tgProjectLogoModel', ['$parse', ProjectLogoModelDirective])
AdminProjectRestrictionsDirective = () ->
return {
scope: {
"canBePrivateProject": "=",
"canBePublicProject": "="
"project": "="
},
templateUrl: "admin/admin-project-restrictions.html"
}

12
app/coffee/modules/common/importer.coffee
View File

@ -38,36 +38,36 @@ ImportProjectButtonDirective = ($rs, $confirm, $location, $navUrls, $translate,
privateError = !currentUserService.canCreatePrivateProjects().valid
maxMembers = null
if user.get('max_members_private_projects') != null && result.headers.members > user.get('max_members_private_projects')
if user.get('max_memberships_private_projects') != null && result.headers.members > user.get('max_memberships_private_projects')
membersError = true
else
membersError = false
if privateError && membersError
errorKey = 'private-space-members'
maxMembers = user.get('max_members_private_projects')
maxMembers = user.get('max_memberships_private_projects')
else if privateError
errorKey = 'private-space'
else if membersError
errorKey = 'private-members'
maxMembers = user.get('max_members_private_projects')
maxMembers = user.get('max_memberships_private_projects')
else
publicError = !currentUserService.canCreatePublicProjects().valid
if user.get('max_members_public_projects') != null && result.headers.members > user.get('max_members_public_projects')
if user.get('max_memberships_public_projects') != null && result.headers.members > user.get('max_memberships_public_projects')
membersError = true
else
membersError = false
if publicError && membersError
errorKey = 'public-space-members'
maxMembers = user.get('max_members_public_projects')
maxMembers = user.get('max_memberships_public_projects')
else if publicError
errorKey = 'public-space'
else if membersError
errorKey = 'public-members'
maxMembers = user.get('max_members_public_projects')
maxMembers = user.get('max_memberships_public_projects')
return {
key: errorKey,

51
app/modules/services/current-user.service.coffee
View File

@ -118,57 +118,6 @@ class CurrentUserService
return @.projects
canAddMoreMembersInPrivateProjects: (projectId) ->
project = @.projects.get('all').find (project) -> project.get('id') == projectId
user = @.getUser()
if user.get('max_members_private_projects') != null && project.get('members').size >= user.get('max_members_private_projects')
return {valid: false, reason: 'max_members_private_projects', type: 'private_project'}
return {valid: true}
canAddMoreMembersInPublicProjects: (projectId) ->
project = @.projects.get('all').find (project) -> project.get('id') == projectId
user = @.getUser()
if user.get('max_members_public_projects') != null && project.get('members').size >= user.get('max_members_public_projects')
return {valid: false, reason: 'max_members_public_projects', type: 'public_project'}
return {valid: true}
canBePrivateProject: (projectId) ->
project = @.projects.get('all').find (project) -> project.get('id') == projectId
return {valid: true} if project.get('is_private')
result = @.canCreatePrivateProjects()
return result if !result.valid
user = @.getUser()
if user.get('max_members_private_projects') != null && project.get('members').size > user.get('max_members_private_projects')
return {valid: false, reason: 'max_members_private_projects', type: 'private_project'}
return {valid: true}
canBePublicProject: (projectId) ->
project = @.projects.get('all').find (project) -> project.get('id') == projectId
return {valid: true} if !project.get('is_private')
result = @.canCreatePublicProjects()
return result if !result.valid
user = @.getUser()
if user.get('max_members_public_projects') != null && project.get('members').size > user.get('max_members_public_projects')
return {valid: false, reason: 'max_members_public_projects', type: 'public_project'}
return {valid: true}
canCreatePrivateProjects: () ->
user = @.getUser()

282
app/modules/services/current-user.service.spec.coffee
View File

@ -204,112 +204,6 @@ describe "tgCurrentUserService", ->
done()
it "the user can't add more members in private projects", () ->
user = Immutable.fromJS({
id: 1,
name: "fake1",
max_members_private_projects: 2
})
projects = Immutable.fromJS({
all: [
{id: 1, name: "fake1"},
{id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: true},
{id: 3, name: "fake3"},
{id: 4, name: "fake4"}
]
})
currentUserService._user = user
currentUserService._projects = projects
result = currentUserService.canAddMoreMembersInPrivateProjects(2)
expect(result).to.be.eql({
valid: false,
reason: 'max_members_private_projects',
type: 'private_project'
})
it "the user can add more members in private projects", () ->
user = Immutable.fromJS({
id: 1,
name: "fake1",
max_members_private_projects: 7
})
currentUserService._user = user
projects = Immutable.fromJS({
all: [
{id: 1, name: "fake1"},
{id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: true},
{id: 3, name: "fake3"},
{id: 4, name: "fake4"}
]
})
currentUserService._projects = projects
result = currentUserService.canAddMoreMembersInPrivateProjects(2)
expect(result).to.be.eql({
valid: true
})
it "the user can't add more members in public projects", () ->
user = Immutable.fromJS({
id: 1,
name: "fake1",
max_members_public_projects: 2
})
projects = Immutable.fromJS({
all: [
{id: 1, name: "fake1"},
{id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: false},
{id: 3, name: "fake3"},
{id: 4, name: "fake4"}
]
})
currentUserService._user = user
currentUserService._projects = projects
result = currentUserService.canAddMoreMembersInPublicProjects(2)
expect(result).to.be.eql({
valid: false,
reason: 'max_members_public_projects',
type: 'public_project'
})
it "the user can add more members in public projects", () ->
user = Immutable.fromJS({
id: 1,
name: "fake1",
max_members_public_projects: 7
})
projects = Immutable.fromJS({
all: [
{id: 1, name: "fake1"},
{id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: false},
{id: 3, name: "fake3"},
{id: 4, name: "fake4"}
]
})
currentUserService._user = user
currentUserService._projects = projects
result = currentUserService.canAddMoreMembersInPublicProjects(2)
expect(result).to.be.eql({
valid: true
})
it "the user can't create private projects if they reach the maximum number of private projects", () ->
user = Immutable.fromJS({
id: 1,
@ -334,7 +228,7 @@ describe "tgCurrentUserService", ->
name: "fake1",
max_private_projects: 10,
total_private_projects: 1,
max_members_private_projects: 20
max_memberships_private_projects: 20
})
currentUserService._user = user
@ -345,92 +239,6 @@ describe "tgCurrentUserService", ->
valid: true
})
it "the user can't convert a private project to a public project if they reach the maximum number of members", () ->
user = Immutable.fromJS({
id: 1,
name: "fake1",
max_private_projects: 10,
total_private_projects: 1,
max_members_public_projects: 2
})
currentUserService._user = user
projects = Immutable.fromJS({
all: [
{id: 1, name: "fake1"},
{id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: true},
{id: 3, name: "fake3"},
{id: 4, name: "fake4"}
]
})
currentUserService._projects = projects
result = currentUserService.canBePublicProject(2)
expect(result).to.be.eql({
valid: false,
reason: 'max_members_public_projects',
type: 'public_project'
})
it "the user can convert private projects to a public project", () ->
user = Immutable.fromJS({
id: 1,
name: "fake1",
max_private_projects: 10,
total_private_projects: 1,
max_members_public_projects: 20
})
currentUserService._user = user
projects = Immutable.fromJS({
all: [
{id: 1, name: "fake1"},
{id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
{id: 3, name: "fake3"},
{id: 4, name: "fake4"}
]
})
currentUserService._projects = projects
result = currentUserService.canBePublicProject(2)
expect(result).to.be.eql({
valid: true
})
it "the user can convert public projects to a public project if it is already public", () ->
user = Immutable.fromJS({
id: 1,
name: "fake1",
max_private_projects: 10,
total_private_projects: 100,
max_members_public_projects: 2
})
currentUserService._user = user
projects = Immutable.fromJS({
all: [
{id: 1, name: "fake1"},
{id: 2, name: "fake2", members: [1, 2, 3, 4, 5], is_private: false},
{id: 3, name: "fake3"},
{id: 4, name: "fake4"}
]
})
currentUserService._projects = projects
result = currentUserService.canBePublicProject(2)
expect(result).to.be.eql({
valid: true
})
it "the user can't create public projects if they reach the maximum number of private projects", () ->
user = Immutable.fromJS({
id: 1,
@ -455,7 +263,7 @@ describe "tgCurrentUserService", ->
name: "fake1",
max_public_projects: 10,
total_public_projects: 1,
max_members_public_projects: 20
max_memberships_public_projects: 20
})
currentUserService._user = user
@ -465,89 +273,3 @@ describe "tgCurrentUserService", ->
expect(result).to.be.eql({
valid: true
})
it "the user can't convert a public projects to a private project if they reach the maximum number of members", () ->
user = Immutable.fromJS({
id: 1,
name: "fake1",
max_public_projects: 10,
total_public_projects: 1,
max_members_private_projects: 2
})
currentUserService._user = user
projects = Immutable.fromJS({
all: [
{id: 1, name: "fake1"},
{id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
{id: 3, name: "fake3"},
{id: 4, name: "fake4"}
]
})
currentUserService._projects = projects
result = currentUserService.canBePrivateProject(2)
expect(result).to.be.eql({
valid: false,
reason: 'max_members_private_projects',
type: 'private_project'
})
it "the user can convert public projects to a private project", () ->
user = Immutable.fromJS({
id: 1,
name: "fake1",
max_public_projects: 10,
total_public_projects: 1,
max_members_private_projects: 20
})
currentUserService._user = user
projects = Immutable.fromJS({
all: [
{id: 1, name: "fake1"},
{id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
{id: 3, name: "fake3"},
{id: 4, name: "fake4"}
]
})
currentUserService._projects = projects
result = currentUserService.canBePrivateProject(2)
expect(result).to.be.eql({
valid: true
})
it "the user can convert private project to a private project if it is already private", () ->
user = Immutable.fromJS({
id: 1,
name: "fake1",
max_public_projects: 10,
total_public_projects: 1,
max_members_private_projects: 20
})
currentUserService._user = user
projects = Immutable.fromJS({
all: [
{id: 1, name: "fake1"},
{id: 2, name: "fake2", members: [1, 2, 3, 4, 5]},
{id: 3, name: "fake3"},
{id: 4, name: "fake4"}
]
})
currentUserService._projects = projects
result = currentUserService.canBePrivateProject(2)
expect(result).to.be.eql({
valid: true
})

1
app/modules/services/project.service.coffee
View File

@ -74,5 +74,6 @@ class ProjectService
pslug = @.project.get('slug')
return @projectsService.getProjectBySlug(pslug).then (project) => @.setProject(project)
angular.module("taigaCommon").service("tgProjectService", ProjectService)

9
app/partials/admin/admin-project-profile.jade
View File

@ -102,16 +102,13 @@ div.wrapper(
placeholder="{{ 'ADMIN.PROJECT_PROFILE.RECRUITING_PLACEHOLDER' | translate }}"
)
tg-admin-project-restrictions(
can-be-private-project="canBePrivateProject"
can-be-public-project="canBePublicProject"
)
tg-admin-project-restrictions(project="project")
fieldset
.project-privacy-settings
div.privacy-option
input.privacy-project(
ng-disabled="!canBePublicProject.valid"
ng-disabled="project.is_private && !project.can_is_private_be_updated"
type="radio"
id="private-project"
name="privacy-project"
@ -122,7 +119,7 @@ div.wrapper(
div.privacy-option
input.privacy-project(
ng-disabled="!canBePrivateProject.valid"
ng-disabled="!project.is_private && !project.can_is_private_be_updated"
type="radio"
id="public-project"
name="privacy-project"

15
app/partials/admin/admin-project-restrictions.jade
View File

@ -1,11 +1,10 @@
fieldset(ng-if="!canBePrivateProject.valid")
p
span(ng-if="canBePrivateProject.reason == 'max_private_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }}
fieldset(ng-if="!project.can_is_private_be_updated")
p(ng-if="!project.is_private")
span(ng-if="project.total_memberships < project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }}
span(ng-if="canBePrivateProject.reason == 'max_members_private_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
span(ng-if="project.total_memberships >= project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
fieldset(ng-if="!canBePublicProject.valid")
p
span(ng-if="canBePublicProject.reason == 'max_public_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }}
p(ng-if="project.is_private")
span(ng-if="project.total_memberships < project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }}
span(ng-if="canBePublicProject.reason == 'max_members_public_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}
span(ng-if="project.total_memberships >= project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}