Feature/1175

girderformindlogger/api/api_main.py

@@ -5,7 +5,7 @@
 from .v1 import account, activity, api_key, applet, assetstore, collection, context,    \
     file, folder, group, invitation, item, protocol, relationship, resource,   \
     response, schedule, screen, system, token, user, notification, account_profile, applet_library, \
-    theme
+    theme, cases
 
 
 class ApiDocs(object):
@@ -52,5 +52,6 @@ def _addV1ToNode(node):
     node.v1.account = account_profile.AccountProfile()
     node.v1.library = applet_library.AppletLibrary()
     node.v1.theme = theme.Theme()
-
+    node.v1.cases = cases.Cases()
+
     return node

girderformindlogger/api/v1/applet.py

@@ -682,32 +682,7 @@ def deleteUserFromApplet(self, applet, profileId, deleteResponse=True):
             applet['_id'] not in accountProfile.get('applets', {}).get('coordinator', []):
             raise AccessException('You don\'t have enough permission to perform this action')
 
-        for role in USER_ROLE_KEYS:
-            if role != 'user':
-                profile = self._model.revokeRole(applet, profile, role)
-
-        profile = self._model.revokeRole(applet, profile, 'user')
-
-        ResponseAlerts().deleteResponseAlerts(profile['_id'])
-
-        if deleteResponse:
-            ProfileModel().remove(profile)
-        else:
-            profile['reviewers'] = []
-            profile['deactivated'] = True
-
-            ProfileModel().save(profile, validate=False)
-
-        if deleteResponse:
-            from girderformindlogger.models.response_folder import ResponseItem
-
-            ResponseItem().removeWithQuery(
-                query={
-                    "baseParentType": 'user',
-                    "baseParentId": profile['userId'],
-                    "meta.applet.@id": applet['_id']
-                }
-            )
+        self._model.deleteUserFromApplet(applet, profile, deleteResponse)
 
         return ({
             'message': 'successfully removed user from applet'
@@ -1434,6 +1409,18 @@ def prepareAppletForEdit(self, applet, thread, params):
             dataType='array',
             default=''
         )
+        .param(
+            'caseId',
+            'id of case',
+            required=False,
+            default=None
+        )
+        .param(
+            'entryId',
+            'id of entry',
+            required=False,
+            default=None
+        )
         .jsonParam(
             'pagination',
             'pagination info - allow, pageIndex fields are available',
@@ -1442,7 +1429,7 @@ def prepareAppletForEdit(self, applet, thread, params):
         )
         .errorResponse('Write access was denied for this applet.', 403)
     )
-    def getAppletData(self, id, users, pagination):
+    def getAppletData(self, id, users, caseId, entryId, pagination):
         from datetime import datetime
         from ..rest import setContentDisposition, setRawResponse, setResponseHeader
 
@@ -1452,7 +1439,8 @@ def getAppletData(self, id, users, pagination):
             users = users.replace(' ', '').split(",")
 
         users = users if users else []
-        data = AppletModel().getResponseData(id, thisUser, users, pagination)
+
+        data = AppletModel().getResponseData(id, thisUser, users, caseId, entryId, pagination)
 
         setContentDisposition("{}-{}.{}".format(
             str(id),