From cc6c8ae094ce4fd44223ff0db1e29f63bea3f383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 16 Mar 2016 11:40:40 +0100 Subject: [PATCH] Change max_members_*_projects to max_memberships_*_projects --- app/coffee/modules/admin/memberships.coffee | 4 +-- app/coffee/modules/common/importer.coffee | 12 +++---- .../services/current-user.service.coffee | 16 +++++----- .../services/current-user.service.spec.coffee | 32 +++++++++---------- .../admin/admin-project-restrictions.jade | 4 +-- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee index c55a331c..d91f625c 100644 --- a/app/coffee/modules/admin/memberships.coffee +++ b/app/coffee/modules/admin/memberships.coffee @@ -116,10 +116,10 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai userData = @currentUserService.getUser().toJS() if @currentUserService.canAddMoreMembersInPrivateProjects(@scope.projectId).valid == false - @.maxMembers = userData.max_members_private_projects + @.maxMembers = userData.max_memberships_private_projects @scope.canAddUsers = false else if @currentUserService.canAddMoreMembersInPublicProjects(@scope.projectId).valid == false - @.maxMembers = userData.max_members_public_projects + @.maxMembers = userData.max_memberships_public_projects @scope.canAddUsers = false limitUsersWarning: -> diff --git a/app/coffee/modules/common/importer.coffee b/app/coffee/modules/common/importer.coffee index 46b84007..34fd5585 100644 --- a/app/coffee/modules/common/importer.coffee +++ b/app/coffee/modules/common/importer.coffee @@ -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, diff --git a/app/modules/services/current-user.service.coffee b/app/modules/services/current-user.service.coffee index cfc5ad4b..eaa86b00 100644 --- a/app/modules/services/current-user.service.coffee +++ b/app/modules/services/current-user.service.coffee @@ -122,8 +122,8 @@ class CurrentUserService 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'} + if user.get('max_memberships_private_projects') != null && project.get('members').size >= user.get('max_memberships_private_projects') + return {valid: false, reason: 'max_memberships_private_projects', type: 'private_project'} return {valid: true} @@ -131,8 +131,8 @@ class CurrentUserService 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'} + if user.get('max_memberships_public_projects') != null && project.get('members').size >= user.get('max_memberships_public_projects') + return {valid: false, reason: 'max_memberships_public_projects', type: 'public_project'} return {valid: true} @@ -148,8 +148,8 @@ class CurrentUserService 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'} + if user.get('max_memberships_private_projects') != null && project.get('members').size > user.get('max_memberships_private_projects') + return {valid: false, reason: 'max_memberships_private_projects', type: 'private_project'} return {valid: true} @@ -164,8 +164,8 @@ class CurrentUserService 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'} + if user.get('max_memberships_public_projects') != null && project.get('members').size > user.get('max_memberships_public_projects') + return {valid: false, reason: 'max_memberships_public_projects', type: 'public_project'} return {valid: true} diff --git a/app/modules/services/current-user.service.spec.coffee b/app/modules/services/current-user.service.spec.coffee index 9747924b..8e04980a 100644 --- a/app/modules/services/current-user.service.spec.coffee +++ b/app/modules/services/current-user.service.spec.coffee @@ -208,7 +208,7 @@ describe "tgCurrentUserService", -> user = Immutable.fromJS({ id: 1, name: "fake1", - max_members_private_projects: 2 + max_memberships_private_projects: 2 }) projects = Immutable.fromJS({ @@ -227,7 +227,7 @@ describe "tgCurrentUserService", -> expect(result).to.be.eql({ valid: false, - reason: 'max_members_private_projects', + reason: 'max_memberships_private_projects', type: 'private_project' }) @@ -235,7 +235,7 @@ describe "tgCurrentUserService", -> user = Immutable.fromJS({ id: 1, name: "fake1", - max_members_private_projects: 7 + max_memberships_private_projects: 7 }) currentUserService._user = user @@ -261,7 +261,7 @@ describe "tgCurrentUserService", -> user = Immutable.fromJS({ id: 1, name: "fake1", - max_members_public_projects: 2 + max_memberships_public_projects: 2 }) projects = Immutable.fromJS({ @@ -280,7 +280,7 @@ describe "tgCurrentUserService", -> expect(result).to.be.eql({ valid: false, - reason: 'max_members_public_projects', + reason: 'max_memberships_public_projects', type: 'public_project' }) @@ -288,7 +288,7 @@ describe "tgCurrentUserService", -> user = Immutable.fromJS({ id: 1, name: "fake1", - max_members_public_projects: 7 + max_memberships_public_projects: 7 }) projects = Immutable.fromJS({ @@ -334,7 +334,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 @@ -351,7 +351,7 @@ describe "tgCurrentUserService", -> name: "fake1", max_private_projects: 10, total_private_projects: 1, - max_members_public_projects: 2 + max_memberships_public_projects: 2 }) currentUserService._user = user @@ -371,7 +371,7 @@ describe "tgCurrentUserService", -> expect(result).to.be.eql({ valid: false, - reason: 'max_members_public_projects', + reason: 'max_memberships_public_projects', type: 'public_project' }) @@ -381,7 +381,7 @@ describe "tgCurrentUserService", -> name: "fake1", max_private_projects: 10, total_private_projects: 1, - max_members_public_projects: 20 + max_memberships_public_projects: 20 }) currentUserService._user = user @@ -409,7 +409,7 @@ describe "tgCurrentUserService", -> name: "fake1", max_private_projects: 10, total_private_projects: 100, - max_members_public_projects: 2 + max_memberships_public_projects: 2 }) currentUserService._user = user @@ -455,7 +455,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 @@ -472,7 +472,7 @@ describe "tgCurrentUserService", -> name: "fake1", max_public_projects: 10, total_public_projects: 1, - max_members_private_projects: 2 + max_memberships_private_projects: 2 }) currentUserService._user = user @@ -492,7 +492,7 @@ describe "tgCurrentUserService", -> expect(result).to.be.eql({ valid: false, - reason: 'max_members_private_projects', + reason: 'max_memberships_private_projects', type: 'private_project' }) @@ -502,7 +502,7 @@ describe "tgCurrentUserService", -> name: "fake1", max_public_projects: 10, total_public_projects: 1, - max_members_private_projects: 20 + max_memberships_private_projects: 20 }) currentUserService._user = user @@ -530,7 +530,7 @@ describe "tgCurrentUserService", -> name: "fake1", max_public_projects: 10, total_public_projects: 1, - max_members_private_projects: 20 + max_memberships_private_projects: 20 }) currentUserService._user = user diff --git a/app/partials/admin/admin-project-restrictions.jade b/app/partials/admin/admin-project-restrictions.jade index 12a481bf..e0b80b45 100644 --- a/app/partials/admin/admin-project-restrictions.jade +++ b/app/partials/admin/admin-project-restrictions.jade @@ -2,10 +2,10 @@ fieldset(ng-if="!canBePrivateProject.valid") p 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") p 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 }}