diff --git a/app/modules/services/project.service.coffee b/app/modules/services/project.service.coffee index c09a8749..a6640ac5 100644 --- a/app/modules/services/project.service.coffee +++ b/app/modules/services/project.service.coffee @@ -74,6 +74,6 @@ class ProjectService pslug = @.project.get('slug') return @projectsService.getProjectBySlug(pslug).then (project) => @.setProject(project) - + angular.module("taigaCommon").service("tgProjectService", ProjectService) diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade index b188bb57..300f287a 100644 --- a/app/partials/admin/admin-project-profile.jade +++ b/app/partials/admin/admin-project-profile.jade @@ -108,7 +108,7 @@ div.wrapper( .project-privacy-settings div.privacy-option input.privacy-project( - ng-disabled="project.is_private && !project.can_is_private_be_updated" + ng-disabled="project.is_private && !project.is_private_extra_data.can_be_updated" type="radio" id="private-project" name="privacy-project" @@ -119,7 +119,7 @@ div.wrapper( div.privacy-option input.privacy-project( - ng-disabled="!project.is_private && !project.can_is_private_be_updated" + ng-disabled="!project.is_private && !project.is_private_extra_data.can_be_updated" type="radio" id="public-project" name="privacy-project" diff --git a/app/partials/admin/admin-project-restrictions.jade b/app/partials/admin/admin-project-restrictions.jade index c56b08a1..22a5e835 100644 --- a/app/partials/admin/admin-project-restrictions.jade +++ b/app/partials/admin/admin-project-restrictions.jade @@ -1,10 +1,8 @@ -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 }} +fieldset(ng-if="!project.is_private_extra_data.can_be_updated" ng-switch="project.is_private_extra_data.reason") + span(ng-switch-when="max-private-projects") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS' | translate }} - span(ng-if="project.total_memberships >= project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | translate }} + span(ng-switch-when="max-private-projects-memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PRIVATE_PROJECTS_MEMBERS' | 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-switch-when="max-public-projects") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS' | translate }} - span(ng-if="project.total_memberships >= project.max_memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }} + span(ng-switch-when="max-public-projects-memberships") {{ 'ADMIN.PROJECT_PROFILE.MAX_PUBLIC_PROJECTS_MEMBERS' | translate }}