Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update prod #90

Merged
merged 9 commits into from
Nov 11, 2023
Merged

Update prod #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c69f4cd
add users
odenypeter Oct 14, 2023
17b1172
fix data
odenypeter Oct 14, 2023
89317d3
fix data
odenypeter Oct 15, 2023
6cf8e66
fix data
odenypeter Oct 15, 2023
ba59656
fix error
odenypeter Nov 8, 2023
a8228d0
fix error
odenypeter Nov 8, 2023
f51b9ce
fix error
odenypeter Nov 8, 2023
eb481a8
fix error
odenypeter Nov 8, 2023
5497626
bump version
odenypeter Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ EXPOSE 8080
ENTRYPOINT ["bash", "/code/scripts/docker-entrypoint.sh"]

# Specify tag name to be created on github
LABEL version="0.5.8"
LABEL version="0.6.0"
23 changes: 22 additions & 1 deletion core/views/coreuser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,27 @@ def me(self, request, *args, **kwargs):
serializer = self.get_serializer(instance=user, context={'request': request})
return Response(serializer.data)

@action(methods=['POST'], detail=False)
def assignees(self, request, *args, **kwargs):
user_uuids = request.data
final_data= dict()
if user_uuids:
users = (
self.get_queryset()
.filter(core_user_uuid__in=user_uuids)
)

final_data = {
item.core_user_uuid: dict(
first_name=item.first_name,
last_name=item.last_name,
)
for item in users
}


return Response(final_data, status=status.HTTP_200_OK)

@swagger_auto_schema(methods=['post'],
request_body=CoreUserInvitationSerializer,
responses=COREUSER_INVITE_RESPONSE)
Expand Down Expand Up @@ -330,4 +351,4 @@ def verify_email(self, request, *args, **kwargs):
{
'success': serializer.is_valid(),
},
status=status.HTTP_200_OK)
status=status.HTTP_200_OK)
8 changes: 7 additions & 1 deletion templates/email/coreuser/invitation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@ <h1 style="text-align: center;"><span style="color: #151f56;"><strong><span styl
<table align="center" style="width: 160px;">
<tbody>
<tr style="height: 20px;">
<td style="font-family: Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 18pt; padding: 12pt; background-color: #ff9f00; color: #ffffff; font-weight: bold; text-align: center;"><a href="{{ invitation_link }}" target="_blank" style="font-weight: bold; letter-spacing: normal; line-height: 100%; text-align: center; text-decoration: none; color: #ffffff;">My profile</a></td>
<td style="font-family: Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 18pt; padding: 12pt; background-color: #ff9f00; color: #ffffff; font-weight: bold; text-align: center;">
<a href="{{ invitation_link }}" target="_blank" style="font-weight: bold; letter-spacing: normal; line-height: 100%; text-align: center; text-decoration: none; color: #ffffff;">My Profile</a><br>
</td>
</tr>
<tr>
<p><span style="color: #737581; font-size: 12pt; font-family: roboto,helvetica neue,helvetica,arial,sans-serif;"><i>Or copy the link: </i></span></p>
<p><a href=""><span style="color: #737581; font-size: 10pt; font-family: roboto,helvetica neue,helvetica,arial,sans-serif;">{{ invitation_link }}</span></a></p>
</tr>
</tbody>
</table>
Expand Down
Loading