pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor and format

Browse Source
This commit is contained in:
Montana 2018-09-05 13:58:30 -04:00
parent 109249d953
commit 40c248df16
4 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
atst/domain/workspaces.py
View File

@ -39,10 +39,7 @@ class Workspaces(object):
def get_for_update(cls, user, workspace_id): def get_for_update(cls, user, workspace_id):
workspace = Workspaces.get(user, workspace_id) workspace = Workspaces.get(user, workspace_id)
Authorization.check_workspace_permission( Authorization.check_workspace_permission(
user, user, workspace, Permissions.ADD_APPLICATION_IN_WORKSPACE, "add project"
workspace,
Permissions.ADD_APPLICATION_IN_WORKSPACE,
"add project",
) )
return workspace return workspace
@ -92,7 +89,7 @@ class Workspaces(object):
user, user,
workspace, workspace,
Permissions.ASSIGN_AND_UNASSIGN_ATAT_ROLE, Permissions.ASSIGN_AND_UNASSIGN_ATAT_ROLE,
"update workspace member", "edit workspace member",
) )
return WorkspaceUsers.update_role(member, workspace.id, role_name) return WorkspaceUsers.update_role(member, workspace.id, role_name)

2
atst/forms/update_member.py → atst/forms/edit_member.py
View File

@ -6,7 +6,7 @@ from atst.forms.fields import SelectField
from .data import WORKSPACE_ROLES from .data import WORKSPACE_ROLES
class UpdateMemberForm(Form): class EditMemberForm(Form):
workspace_role = SelectField( workspace_role = SelectField(
"Workspace Role", choices=WORKSPACE_ROLES, validators=[Optional()] "Workspace Role", choices=WORKSPACE_ROLES, validators=[Optional()]

4
atst/models/user.py
View File

@ -21,10 +21,6 @@ class User(Base):
first_name = Column(String) first_name = Column(String)
last_name = Column(String) last_name = Column(String)
@property
def role(self):
return self.atat_role.name
@property @property
def atat_permissions(self): def atat_permissions(self):
return self.atat_role.permissions return self.atat_role.permissions

23
atst/routes/workspaces.py
View File

@ -13,8 +13,7 @@ from atst.domain.workspace_users import WorkspaceUsers
from atst.domain.projects import Projects from atst.domain.projects import Projects
from atst.forms.new_project import NewProjectForm from atst.forms.new_project import NewProjectForm
from atst.forms.new_member import NewMemberForm from atst.forms.new_member import NewMemberForm
from atst.forms.update_member import UpdateMemberForm from atst.forms.edit_member import EditMemberForm
from atst.forms.forms import ValidatedForm
from atst.domain.authz import Authorization from atst.domain.authz import Authorization
from atst.models.permissions import Permissions from atst.models.permissions import Permissions
@ -117,7 +116,7 @@ def create_member(workspace_id):
url_for( url_for(
"workspaces.workspace_members", "workspaces.workspace_members",
workspace_id=workspace.id, workspace_id=workspace.id,
newMemberName=new_member.user.full_name, newMemberName=new_member.user_name,
) )
) )
else: else:
@ -134,7 +133,7 @@ def view_member(workspace_id, member_id):
"edit this workspace user", "edit this workspace user",
) )
member = WorkspaceUsers.get(workspace_id, member_id) member = WorkspaceUsers.get(workspace_id, member_id)
form = UpdateMemberForm(workspace_role=member.role) form = EditMemberForm(workspace_role=member.role)
return render_template( return render_template(
"member_edit.html", form=form, workspace=workspace, member=member "member_edit.html", form=form, workspace=workspace, member=member
) )
@ -152,22 +151,20 @@ def update_member(workspace_id, member_id):
"edit this workspace user", "edit this workspace user",
) )
member = WorkspaceUsers.get(workspace_id, member_id) member = WorkspaceUsers.get(workspace_id, member_id)
form = UpdateMemberForm(http_request.form) form = EditMemberForm(http_request.form)
if form.validate(): if form.validate():
if form.data["workspace_role"]: role = None
if form.data["workspace_role"] != member.role:
role = form.data["workspace_role"] role = form.data["workspace_role"]
else: Workspaces.update_member(g.current_user, workspace, member, role)
role = member.user.role
Workspaces.update_member(
g.current_user, workspace, member, role
)
return redirect( return redirect(
url_for( url_for(
"workspaces.workspace_members", "workspaces.workspace_members",
workspace_id=workspace.id, workspace_id=workspace.id,
memberName=member.user.full_name, memberName=member.user_name,
updatedRole=form.data["workspace_role"], updatedRole=role,
) )
) )
else: else: