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

Change max_members_*_projects to max_memberships_*_projects

stable
David Barragán Merino 2016-03-16 11:40:40 +01:00
parent 8e0a10266c
commit cc6c8ae094
5 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,10 +116,10 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
userData = @currentUserService.getUser().toJS() userData = @currentUserService.getUser().toJS()
if @currentUserService.canAddMoreMembersInPrivateProjects(@scope.projectId).valid == false if @currentUserService.canAddMoreMembersInPrivateProjects(@scope.projectId).valid == false
@.maxMembers = userData.max_members_private_projects @.maxMembers = userData.max_memberships_private_projects
@scope.canAddUsers = false @scope.canAddUsers = false
else if @currentUserService.canAddMoreMembersInPublicProjects(@scope.projectId).valid == false else if @currentUserService.canAddMoreMembersInPublicProjects(@scope.projectId).valid == false
@.maxMembers = userData.max_members_public_projects @.maxMembers = userData.max_memberships_public_projects
@scope.canAddUsers = false @scope.canAddUsers = false
limitUsersWarning: -> limitUsersWarning: ->

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

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

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

@ -122,8 +122,8 @@ class CurrentUserService
project = @.projects.get('all').find (project) -> project.get('id') == projectId project = @.projects.get('all').find (project) -> project.get('id') == projectId
user = @.getUser() user = @.getUser()
if user.get('max_members_private_projects') != null && project.get('members').size >= user.get('max_members_private_projects') if user.get('max_memberships_private_projects') != null && project.get('members').size >= user.get('max_memberships_private_projects')
return {valid: false, reason: 'max_members_private_projects', type: 'private_project'} return {valid: false, reason: 'max_memberships_private_projects', type: 'private_project'}
return {valid: true} return {valid: true}
@ -131,8 +131,8 @@ class CurrentUserService
project = @.projects.get('all').find (project) -> project.get('id') == projectId project = @.projects.get('all').find (project) -> project.get('id') == projectId
user = @.getUser() user = @.getUser()
if user.get('max_members_public_projects') != null && project.get('members').size >= user.get('max_members_public_projects') if user.get('max_memberships_public_projects') != null && project.get('members').size >= user.get('max_memberships_public_projects')
return {valid: false, reason: 'max_members_public_projects', type: 'public_project'} return {valid: false, reason: 'max_memberships_public_projects', type: 'public_project'}
return {valid: true} return {valid: true}
@ -148,8 +148,8 @@ class CurrentUserService
user = @.getUser() user = @.getUser()
if user.get('max_members_private_projects') != null && project.get('members').size > user.get('max_members_private_projects') if user.get('max_memberships_private_projects') != null && project.get('members').size > user.get('max_memberships_private_projects')
return {valid: false, reason: 'max_members_private_projects', type: 'private_project'} return {valid: false, reason: 'max_memberships_private_projects', type: 'private_project'}
return {valid: true} return {valid: true}
@ -164,8 +164,8 @@ class CurrentUserService
user = @.getUser() user = @.getUser()
if user.get('max_members_public_projects') != null && project.get('members').size > user.get('max_members_public_projects') if user.get('max_memberships_public_projects') != null && project.get('members').size > user.get('max_memberships_public_projects')
return {valid: false, reason: 'max_members_public_projects', type: 'public_project'} return {valid: false, reason: 'max_memberships_public_projects', type: 'public_project'}
return {valid: true} return {valid: true}

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

@ -208,7 +208,7 @@ describe "tgCurrentUserService", ->
user = Immutable.fromJS({ user = Immutable.fromJS({
id: 1, id: 1,
name: "fake1", name: "fake1",
max_members_private_projects: 2 max_memberships_private_projects: 2
}) })
projects = Immutable.fromJS({ projects = Immutable.fromJS({
@ -227,7 +227,7 @@ describe "tgCurrentUserService", ->
expect(result).to.be.eql({ expect(result).to.be.eql({
valid: false, valid: false,
reason: 'max_members_private_projects', reason: 'max_memberships_private_projects',
type: 'private_project' type: 'private_project'
}) })
@ -235,7 +235,7 @@ describe "tgCurrentUserService", ->
user = Immutable.fromJS({ user = Immutable.fromJS({
id: 1, id: 1,
name: "fake1", name: "fake1",
max_members_private_projects: 7 max_memberships_private_projects: 7
}) })
currentUserService._user = user currentUserService._user = user
@ -261,7 +261,7 @@ describe "tgCurrentUserService", ->
user = Immutable.fromJS({ user = Immutable.fromJS({
id: 1, id: 1,
name: "fake1", name: "fake1",
max_members_public_projects: 2 max_memberships_public_projects: 2
}) })
projects = Immutable.fromJS({ projects = Immutable.fromJS({
@ -280,7 +280,7 @@ describe "tgCurrentUserService", ->
expect(result).to.be.eql({ expect(result).to.be.eql({
valid: false, valid: false,
reason: 'max_members_public_projects', reason: 'max_memberships_public_projects',
type: 'public_project' type: 'public_project'
}) })
@ -288,7 +288,7 @@ describe "tgCurrentUserService", ->
user = Immutable.fromJS({ user = Immutable.fromJS({
id: 1, id: 1,
name: "fake1", name: "fake1",
max_members_public_projects: 7 max_memberships_public_projects: 7
}) })
projects = Immutable.fromJS({ projects = Immutable.fromJS({
@ -334,7 +334,7 @@ describe "tgCurrentUserService", ->
name: "fake1", name: "fake1",
max_private_projects: 10, max_private_projects: 10,
total_private_projects: 1, total_private_projects: 1,
max_members_private_projects: 20 max_memberships_private_projects: 20
}) })
currentUserService._user = user currentUserService._user = user
@ -351,7 +351,7 @@ describe "tgCurrentUserService", ->
name: "fake1", name: "fake1",
max_private_projects: 10, max_private_projects: 10,
total_private_projects: 1, total_private_projects: 1,
max_members_public_projects: 2 max_memberships_public_projects: 2
}) })
currentUserService._user = user currentUserService._user = user
@ -371,7 +371,7 @@ describe "tgCurrentUserService", ->
expect(result).to.be.eql({ expect(result).to.be.eql({
valid: false, valid: false,
reason: 'max_members_public_projects', reason: 'max_memberships_public_projects',
type: 'public_project' type: 'public_project'
}) })
@ -381,7 +381,7 @@ describe "tgCurrentUserService", ->
name: "fake1", name: "fake1",
max_private_projects: 10, max_private_projects: 10,
total_private_projects: 1, total_private_projects: 1,
max_members_public_projects: 20 max_memberships_public_projects: 20
}) })
currentUserService._user = user currentUserService._user = user
@ -409,7 +409,7 @@ describe "tgCurrentUserService", ->
name: "fake1", name: "fake1",
max_private_projects: 10, max_private_projects: 10,
total_private_projects: 100, total_private_projects: 100,
max_members_public_projects: 2 max_memberships_public_projects: 2
}) })
currentUserService._user = user currentUserService._user = user
@ -455,7 +455,7 @@ describe "tgCurrentUserService", ->
name: "fake1", name: "fake1",
max_public_projects: 10, max_public_projects: 10,
total_public_projects: 1, total_public_projects: 1,
max_members_public_projects: 20 max_memberships_public_projects: 20
}) })
currentUserService._user = user currentUserService._user = user
@ -472,7 +472,7 @@ describe "tgCurrentUserService", ->
name: "fake1", name: "fake1",
max_public_projects: 10, max_public_projects: 10,
total_public_projects: 1, total_public_projects: 1,
max_members_private_projects: 2 max_memberships_private_projects: 2
}) })
currentUserService._user = user currentUserService._user = user
@ -492,7 +492,7 @@ describe "tgCurrentUserService", ->
expect(result).to.be.eql({ expect(result).to.be.eql({
valid: false, valid: false,
reason: 'max_members_private_projects', reason: 'max_memberships_private_projects',
type: 'private_project' type: 'private_project'
}) })
@ -502,7 +502,7 @@ describe "tgCurrentUserService", ->
name: "fake1", name: "fake1",
max_public_projects: 10, max_public_projects: 10,
total_public_projects: 1, total_public_projects: 1,
max_members_private_projects: 20 max_memberships_private_projects: 20
}) })
currentUserService._user = user currentUserService._user = user
@ -530,7 +530,7 @@ describe "tgCurrentUserService", ->
name: "fake1", name: "fake1",
max_public_projects: 10, max_public_projects: 10,
total_public_projects: 1, total_public_projects: 1,
max_members_private_projects: 20 max_memberships_private_projects: 20
}) })
currentUserService._user = user currentUserService._user = user

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

@ -2,10 +2,10 @@ fieldset(ng-if="!canBePrivateProject.valid")
p p
span(ng-if="canBePrivateProject.reason == 'max_private_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }} span(ng-if="canBePrivateProject.reason == 'max_private_projects'") {{ '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="canBePrivateProject.reason == 'max_memberships_private_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }}
fieldset(ng-if="!canBePublicProject.valid") fieldset(ng-if="!canBePublicProject.valid")
p p
span(ng-if="canBePublicProject.reason == 'max_public_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }} span(ng-if="canBePublicProject.reason == 'max_public_projects'") {{ '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="canBePublicProject.reason == 'max_memberships_public_projects'") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}