X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCase%2FBAO%2FCase.php;h=9166a1cd16f72f518213d84b387183a7b03d6a25;hb=3dcde2b984f340773f1f8915f5118744ba5a5852;hp=05030a9860b11a8da70f4e143af589d3d8da0930;hpb=a14e123a77a33879f3dd63c74b0c72031e0c8b5f;p=civicrm-core.git
diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index 05030a9860..9166a1cd16 100644
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -1160,6 +1160,9 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
$orderBy = " ORDER BY $sortBy ";
}
+ $page = CRM_Utils_Array::value('page', $params);
+ $rp = CRM_Utils_Array::value('rp', $params);
+
if (!$page) {
$page = 1;
}
@@ -1170,12 +1173,9 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
$limit = " LIMIT $start, $rp";
$query = $select . $from . $where . $groupBy . $orderBy . $limit;
- $params = array(1 => array($caseID, 'Integer'));
+ $queryParams = array(1 => array($caseID, 'Integer'));
- $dao = CRM_Core_DAO::executeQuery($query, $params);
-
- $page = CRM_Utils_Array::value('page', $params);
- $rp = CRM_Utils_Array::value('rp', $params);
+ $dao = CRM_Core_DAO::executeQuery($query, $queryParams);
$activityTypes = CRM_Case_PseudoConstant::caseActivityType(FALSE, TRUE);
$activityStatuses = CRM_Core_PseudoConstant::activityStatus();
@@ -1235,8 +1235,10 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
}
$caseActivities = array();
+ $caseCount = 0;
while ($dao->fetch()) {
+ $caseCount++;
$caseActivity = array();
$caseActivityId = $dao->id;
@@ -1322,8 +1324,8 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
$url = "";
$css = 'class="action-item crm-hover-button"';
if ($allowView) {
- $url = CRM_Utils_System::url('civicrm/case/activity/view', array('cid' => $contactID, 'aid' => $caseActivityId));
- //$subject = '';
+ $viewUrl = CRM_Utils_System::url('civicrm/case/activity/view', array('cid' => $contactID, 'aid' => $caseActivityId));
+ $url = '' . ts('View') . '';
}
$additionalUrl = "&id={$caseActivityId}";
if (!$dao->deleted) {
@@ -1331,7 +1333,7 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
if (!in_array($dao->type, $emailActivityTypeIDs)) {
//hide Edit link if activity type is NOT editable (special case activities).CRM-5871
if ($allowEdit) {
- $url = '' . ts('Edit') . ' ';
+ $url .= '' . ts('Edit') . ' ';
}
}
if ($allowDelete) {
@@ -1375,8 +1377,8 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
$caseActivitiesDT = array();
$caseActivitiesDT['data'] = $caseActivities;
- $caseActivitiesDT['recordsTotal'] = $params['total'];
- $caseActivitiesDT['recordsFiltered'] = $params['total'];
+ $caseActivitiesDT['recordsTotal'] = $caseCount;
+ $caseActivitiesDT['recordsFiltered'] = $caseCount;
return $caseActivitiesDT;
}