Merge pull request #420 from compucorp/CPS-155-fix-draft-email-assignee

CPS-155: Fix draft email assignee
compucorp · Apr 2, 2020 · cb95e77 · cb95e77
2 parents 67536b0 + 33530bf
commit cb95e77
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 5 deletions.
diff --git a/CRM/Civicase/Hook/PermissionCheck/CaseCategory.php b/CRM/Civicase/Hook/PermissionCheck/CaseCategory.php
@@ -140,7 +140,12 @@ private function getCaseCategoryName() {
     $isAjaxRequest = $url == 'civicrm/ajax/rest';
     $isCaseActivityPage = $url == 'civicrm/case/activity';
     $isPrintActivityReportPage = $url == 'civicrm/case/customreport/print';
-    $isActivityPage = $url == 'civicrm/activity' || $url == 'civicrm/activity/add';
+    $isActivityPage = in_array($url, [
+      'civicrm/activity',
+      'civicrm/activity/add',
+      'civicrm/activity/pdf/view',
+      'civicrm/activity/email/view',
+    ]);
     $isCaseContactTabPage = $url == 'civicrm/case/contact-case-tab';
     $isDownloadAllActivityFilesPage = $url == 'civicrm/case/activity/download-all-files';
 

diff --git a/CRM/Civicase/Hook/ValidateForm/SaveActivityDraft.php b/CRM/Civicase/Hook/ValidateForm/SaveActivityDraft.php
@@ -66,7 +66,7 @@ private function saveDraftForSpecialForms($formName, CRM_Core_Form &$form, array
       'status_id' => 'Draft',
       'case_id' => $caseId,
       'id' => $form->getVar('_activityId'),
-      'assignee_id' => $form->getVar('_contactIds'),
+      'assignee_id' => CRM_Core_Session::getLoggedInContactID(),
     ];
     if (in_array($formName, $this->specialForms)) {
       $params['details'] = CRM_Utils_Array::value('html_message', $fields);

diff --git a/CRM/Civicase/Hook/alterAPIPermissions/Case.php b/CRM/Civicase/Hook/alterAPIPermissions/Case.php
@@ -180,7 +180,7 @@ private function getCaseCategoryName($entity, $action, array $params) {
    *   Case category name.
    */
   private function getCaseCategoryNameFromCaseType(array $params, $key) {
-    if (empty($params[$key])) {
+    if (empty($params[$key]) || !is_numeric($params[$key])) {
       return;
     }
 
@@ -199,7 +199,7 @@ private function getCaseCategoryNameFromCaseType(array $params, $key) {
    *   Case category name.
    */
   private function getCaseCategoryNameFromCaseId(array $params, $key) {
-    if (empty($params[$key])) {
+    if (empty($params[$key]) || !is_numeric($params[$key])) {
       return;
     }
 

diff --git a/ang/civicase/activity/activity-forms/services/draft-email-activity-form.service.js b/ang/civicase/activity/activity-forms/services/draft-email-activity-form.service.js
@@ -33,9 +33,11 @@
 
       return getCrmUrl('civicrm/activity/email/' + options.action, {
         action: options.action,
+        atype: activity.activity_type_id,
         caseId: activity.case_id,
         cid: assigneeContactId,
         draft_id: activity.id,
+        id: activity.id,
         reset: '1'
       });
     }

diff --git a/ang/test/civicase/activity/activity-forms/services/draft-email-activity-form.service.spec.js b/ang/test/civicase/activity/activity-forms/services/draft-email-activity-form.service.spec.js
@@ -51,9 +51,11 @@
 
         expectedActivityFormUrlParams = {
           action: 'add',
+          atype: activity.activity_type_id,
           caseId: activity.case_id,
           cid: activity.assignee_contact_id[0],
           draft_id: activity.id,
+          id: activity.id,
           reset: '1'
         };
       });

diff --git a/css/civicase.min.css b/css/civicase.min.css
diff --git a/scss/components/_draft-activity-panel.scss b/scss/components/_draft-activity-panel.scss
@@ -0,0 +1,10 @@
+/**
+ * We temporarily hide the "File On Case" action for draft activities.
+ * This is done because this functionality needs to be fixed so it works
+ * with case categories, and supports translation. More info on CPS-155.
+ */
+.civicase__activity-panel__core_container--draft {
+  [title='File On Case'] {
+    display: none;
+  }
+}