📝 ✨ Invite any role, not just users (#234)

ChildMindInstitute · Nov 25, 2019 · 6fb76cb · 6fb76cb
2 parents a75f787 + dc3dd8b
commit 6fb76cb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,6 +8,10 @@ Changes
 -------
 Unreleased
 ==========
+2019-11-25: v0.6.5
+^^^^^^^^^^^^^^^^^^
+* :pencil: Allow invitations for roles other than "user"
+
 2019-11-21: v0.6.4
 ^^^^^^^^^^^^^^^^^^
 * :sparkles: Informant-subject relationships

diff --git a/girderformindlogger/api/v1/applet.py b/girderformindlogger/api/v1/applet.py
@@ -384,7 +384,7 @@ def invite(self, applet, role="user", idCode=None, profile=None):
             invitation = Invitation().createInvitation(
                 applet=applet,
                 coordinator=user,
-                role="user",
+                role=role,
                 profile=profile,
                 idCode=idCode
             )

diff --git a/girderformindlogger/models/invitation.py b/girderformindlogger/models/invitation.py
@@ -132,6 +132,7 @@ def createInvitation(
             'appletId': applet['_id'],
             'created': now,
             'updated': now,
+            'role': role,
             'size': 0,
             'invitedBy': Profile().coordinatorProfile(
                 applet['_id'],
@@ -242,6 +243,7 @@ def htmlInvitation(
         except:
             skin = {}
         instanceName = skin.get("name", "MindLogger")
+        role = invitation.get("role", "user")
         try:
             coordinator = Profile().coordinatorProfile(
                 applet['_id'],
@@ -273,8 +275,7 @@ def htmlInvitation(
             Applet().listUsers(applet, 'reviewer', force=True)
         )
         body = """
-{greeting}ou have been invited {byCoordinator}to <b>{appletName}</b> on
-{instanceName}.
+{greeting}ou have been invited {byCoordinator}to be {role} of <b>{appletName}</b>{instanceName}.
 <br/>
 {description}
 {reviewers}
@@ -304,7 +305,9 @@ def htmlInvitation(
             greeting="Welcome {}; y".format(
                 displayProfile['displayName']
             ) if 'displayName' in displayProfile else "Welcome! Y",
-            instanceName=instanceName,
+            instanceName=" on {}".format(
+                instanceName
+            ) if instanceName is not None and len(instanceName) else "",
             managers="<h3>Users who can change this applet's settings, "
                 " including who can access your data: </h3>{}"
                 "".format(
@@ -314,9 +317,9 @@ def htmlInvitation(
                 "applet: </h3>{}"
                 "".format(
                     reviewers if len(reviewers) else "<ul><li>None</li></ul>"
-                )
+                ),
+            role="an editor" if role=="editor" else "a {}".format(role)
         ).strip()
-        print(body)
         return(body if not fullDoc else """
 <!DOCTYPE html>
 <html>