projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #12032 from jitendrapurohit/core-80
[civicrm-core.git]
/
CRM
/
Case
/
BAO
/
Case.php
diff --git
a/CRM/Case/BAO/Case.php
b/CRM/Case/BAO/Case.php
index 940eeef3f174f9e602651df601b043da1150371b..9602becaa7f54659b512d8a42ec1ef8571fd8e52 100644
(file)
--- a/
CRM/Case/BAO/Case.php
+++ b/
CRM/Case/BAO/Case.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version
4.7
|
+ | CiviCRM version
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
7
|
+ | Copyright CiviCRM LLC (c) 2004-201
8
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
7
+ * @copyright CiviCRM LLC (c) 2004-201
8
*/
/**
*/
/**
@@
-1127,10
+1127,10
@@
SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
}
if (!empty($dao->priority)) {
}
if (!empty($dao->priority)) {
- if ($dao->priority == CRM_Core_
OptionGroup::getValue('priority', 'Urgent', 'name
')) {
+ if ($dao->priority == CRM_Core_
PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'priority_id', 'Urgent
')) {
$caseActivity['DT_RowClass'] .= " priority-urgent ";
}
$caseActivity['DT_RowClass'] .= " priority-urgent ";
}
- elseif ($dao->priority == CRM_Core_
OptionGroup::getValue('priority', 'Low', 'name
')) {
+ elseif ($dao->priority == CRM_Core_
PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'priority_id', 'Low
')) {
$caseActivity['DT_RowClass'] .= " priority-low ";
}
}
$caseActivity['DT_RowClass'] .= " priority-low ";
}
}
@@
-1889,7
+1889,7
@@
SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
return NULL;
}
return NULL;
}
- $caseManager
Contact = array()
;
+ $caseManager
Name = '---'
;
$xmlProcessor = new CRM_Case_XMLProcessor_Process();
$managerRoleId = $xmlProcessor->getCaseManagerRoleId($caseType);
$xmlProcessor = new CRM_Case_XMLProcessor_Process();
$managerRoleId = $xmlProcessor->getCaseManagerRoleId($caseType);
@@
-1910,12
+1910,14
@@
SELECT civicrm_contact.id as casemanager_id,
$dao = CRM_Core_DAO::executeQuery($managerRoleQuery, $managerRoleParams);
if ($dao->fetch()) {
$dao = CRM_Core_DAO::executeQuery($managerRoleQuery, $managerRoleParams);
if ($dao->fetch()) {
-
return
sprintf('<a href="%s">%s</a>',
+
$caseManagerName =
sprintf('<a href="%s">%s</a>',
CRM_Utils_System::url('civicrm/contact/view', array('cid' => $dao->casemanager_id)),
$dao->casemanager
);
}
}
CRM_Utils_System::url('civicrm/contact/view', array('cid' => $dao->casemanager_id)),
$dao->casemanager
);
}
}
+
+ return $caseManagerName;
}
/**
}
/**