Skip to content

Commit cb44b2e

Browse files
authored
Merge pull request #3327 from hotosm/develop
v4.1.1 release
2 parents aec03e3 + 64f510d commit cb44b2e

File tree

4 files changed

+19
-25
lines changed

4 files changed

+19
-25
lines changed

backend/services/team_service.py

+14-18
Original file line numberDiff line numberDiff line change
@@ -249,26 +249,22 @@ def get_all_teams(
249249
team_dto.organisation = team.organisation.name
250250
team_dto.organisation_id = team.organisation.id
251251
team_dto.members = []
252-
team_members = TeamService._get_team_members(team.id)
253-
is_team_manager = False
254-
is_team_member = False
255-
for member in team_members:
256-
user = UserService.get_user_by_id(member.user_id)
257-
member_function = TeamMemberFunctions(member.function).name
258-
is_team_member = True if member.user_id == user_id else False
259-
is_team_manager = True if member_function == "MANAGER" else False
260-
# Skip if members are not included
261-
if omit_members:
262-
continue
263-
member_dto = TeamMembersDTO()
264-
member_dto.username = user.username
265-
member_dto.function = member_function
266-
member_dto.picture_url = user.picture_url
267-
member_dto.active = member.active
268-
team_dto.members.append(member_dto)
252+
is_team_member = TeamService.is_user_an_active_team_member(team.id, user_id)
253+
# Skip if members are not included
254+
if not omit_members:
255+
team_members = TeamService._get_team_members(team.id)
256+
for member in team_members:
257+
user = UserService.get_user_by_id(member.user_id)
258+
member_function = TeamMemberFunctions(member.function).name
259+
member_dto = TeamMembersDTO()
260+
member_dto.username = user.username
261+
member_dto.function = member_function
262+
member_dto.picture_url = user.picture_url
263+
member_dto.active = member.active
264+
team_dto.members.append(member_dto)
269265

270266
if team_dto.visibility == "PRIVATE" and not is_admin:
271-
if is_team_manager or is_team_member:
267+
if is_team_member:
272268
teams_list_dto.teams.append(team_dto)
273269
else:
274270
teams_list_dto.teams.append(team_dto)

frontend/src/store/actions/auth.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,7 @@ export const setUserDetails = (username, encodedToken, update = false) => (dispa
129129
dispatch(updateOrgsInfo(orgs.organisations.map((org) => org.organisationId))),
130130
)
131131
.catch((error) => dispatch(updateOrgsInfo([])));
132-
fetchLocalJSONAPI(
133-
`teams/?omitMemberList=true&team_role=PROJECT_MANAGER&member=${userDetails.id}`,
134-
encodedToken,
135-
)
132+
fetchLocalJSONAPI(`teams/?omitMemberList=true&team_role=PROJECT_MANAGER&member=${userDetails.id}`, encodedToken)
136133
.then((teams) => dispatch(updatePMsTeams(teams.teams.map((team) => team.teamId))))
137134
.catch((error) => dispatch(updatePMsTeams([])));
138135
dispatch(setLoader(false));

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Flask-Migrate==2.5.3
1919
Flask-OAuthlib==0.9.4
2020
Flask-RESTful==0.3.8
2121
Flask-Script==2.0.6
22-
Flask-SQLAlchemy==2.4.3
22+
Flask-SQLAlchemy==2.4.4
2323
flask-swagger==0.2.14
2424
gevent==20.6.2
2525
GeoAlchemy2==0.8.4

scripts/aws/cloudformation/tasking-manager.template.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ const Resources = {
132132
Properties: {
133133
AutoScalingGroupName: cf.stackName,
134134
Cooldown: 300,
135-
MinSize: cf.if('IsTaskingManagerProduction', 3, 1),
136-
DesiredCapacity: cf.if('IsTaskingManagerProduction', 3, 1),
135+
MinSize: cf.if('IsTaskingManagerProduction', 2, 1),
136+
DesiredCapacity: cf.if('IsTaskingManagerProduction', 2, 1),
137137
MaxSize: cf.if('IsTaskingManagerProduction', 9, cf.if('IsTaskingManagerDemo', 3, 1)),
138138
HealthCheckGracePeriod: 600,
139139
LaunchConfigurationName: cf.ref('TaskingManagerLaunchConfiguration'),
@@ -149,6 +149,7 @@ const Resources = {
149149
UpdatePolicy: {
150150
AutoScalingRollingUpdate: {
151151
PauseTime: 'PT60M',
152+
MaxBatchSize: 2,
152153
WaitOnResourceSignals: true
153154
}
154155
}

0 commit comments

Comments
 (0)