workspace -> portfolio everywhere

This commit is contained in:
dandds
2019-01-11 09:58:00 -05:00
parent 3fc323d785
commit d3d36822df
122 changed files with 2156 additions and 2129 deletions

View File

@@ -162,7 +162,7 @@ ENVIRONMENT_ROLES = [
ENV_ROLE_MODAL_DESCRIPTION = {
"header": "Assign Environment Role",
"body": "An environment role determines the permissions a member of the workspace assumes when using the JEDI Cloud.<br/><br/>A member may have different environment roles across different applications. A member can only have one assigned environment role in a given environment.",
"body": "An environment role determines the permissions a member of the portfolio assumes when using the JEDI Cloud.<br/><br/>A member may have different environment roles across different applications. A member can only have one assigned environment role in a given environment.",
}
FUNDING_TYPES = [

View File

@@ -11,8 +11,8 @@ class EditMemberForm(FlaskForm):
# This form also accepts a field for each environment in each application
# that the user is a member of
workspace_role = SelectField(
translate("forms.edit_member.workspace_role_label"),
portfolio_role = SelectField(
translate("forms.edit_member.portfolio_role_label"),
choices=WORKSPACE_ROLES,
validators=[Required()],
)

View File

@@ -25,10 +25,10 @@ class NewMemberForm(FlaskForm):
translate("forms.new_member.dod_id_label"),
validators=[Required(), Length(min=10), IsNumber()],
)
workspace_role = SelectField(
translate("forms.new_member.workspace_role_label"),
portfolio_role = SelectField(
translate("forms.new_member.portfolio_role_label"),
choices=WORKSPACE_ROLES,
validators=[Required()],
default="",
description=translate("forms.new_member.workspace_role_description"),
description=translate("forms.new_member.portfolio_role_description"),
)

View File

@@ -181,7 +181,7 @@ class InformationAboutYouForm(CacheableForm):
date_latest_training = inherit_field(USER_FIELDS["date_latest_training"])
class WorkspaceOwnerForm(CacheableForm):
class PortfolioOwnerForm(CacheableForm):
def validate(self, *args, **kwargs):
if self.am_poc.data:
# Prepend Optional validators so that the validation chain

View File

@@ -5,14 +5,14 @@ from .forms import CacheableForm
from atst.utils.localization import translate
class WorkspaceForm(CacheableForm):
class PortfolioForm(CacheableForm):
name = StringField(
translate("forms.workspace.name_label"),
translate("forms.portfolio.name_label"),
validators=[
Length(
min=4,
max=100,
message=translate("forms.workspace.name_length_validation_message"),
message=translate("forms.portfolio.name_length_validation_message"),
)
],
)