Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CiviCRM Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
CiviCRM Core
Commits
6ba89ab6
Commit
6ba89ab6
authored
11 years ago
by
Kurund Jalmi
Browse files
Options
Downloads
Plain Diff
Merge pull request
#1309
from yashodha/4.4
fix typos
parents
007d4008
0a9f61c4
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CRM/Activity/BAO/Activity.php
+17
-16
17 additions, 16 deletions
CRM/Activity/BAO/Activity.php
CRM/Case/BAO/Case.php
+3
-3
3 additions, 3 deletions
CRM/Case/BAO/Case.php
with
20 additions
and
19 deletions
CRM/Activity/BAO/Activity.php
+
17
−
16
View file @
6ba89ab6
...
...
@@ -473,7 +473,7 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity {
}
}
// write to changelog before transation is committed/rolled
// write to changelog before transa
c
tion is committed/rolled
// back (and prepare status to display)
if
(
CRM_Utils_Array
::
value
(
'id'
,
$params
))
{
$logMsg
=
"Activity (id:
{
$result
->
id
}
) updated with "
;
...
...
@@ -642,11 +642,11 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity {
}
/**
* function to get the list Actvities
* function to get the list Act
i
vities
*
* @param array $input array of parameters
* Keys include
* - contact_id int contact_id whose activties we want to retrieve
* - contact_id int contact_id whose activ
i
ties we want to retrieve
* - offset int which row to start from ?
* - rowCount int how many rows to fetch
* - sort object|array object or array describing sort order for sql query.
...
...
@@ -655,7 +655,7 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity {
* - context string page on which selector is build
* - activity_type_id int|string the activitiy types we want to restrict by
*
* @return array (reference) $values the relevant data object values of open activitie
* @return array (reference) $values the relevant data object values of open activitie
s
*
* @access public
* @static
...
...
@@ -921,11 +921,11 @@ INNER JOIN {$activityContactTempTable} on {$activityTempTable}.activity_id = {$a
*
* @param array $input array of parameters
* Keys include
* - contact_id int contact_id whose activties we want to retrieve
* - contact_id int contact_id whose activ
i
ties we want to retrieve
* - admin boolean if contact is admin
* - caseId int case ID
* - context string page on which selector is build
* - activity_type_id int|string the activit
i
y types we want to restrict by
* - activity_type_id int|string the activity types we want to restrict by
*
* @return int count of activities
*
...
...
@@ -957,12 +957,12 @@ LEFT JOIN civicrm_case_activity ON ( civicrm_case_activity.activity_id = tbl.a
*
* @param array $input array of parameters
* Keys include
* - contact_id int contact_id whose activties we want to retrieve
* - contact_id int contact_id whose activ
i
ties we want to retrieve
* - admin boolean if contact is admin
* - caseId int case ID
* - context string page on which selector is build
* - count boolean are we interested in the count clause only?
* - activity_type_id int|string the activit
i
y types we want to restrict by
* - activity_type_id int|string the activity types we want to restrict by
*
* @return int count of activities
*
...
...
@@ -1136,8 +1136,8 @@ INNER JOIN civicrm_contact contact ON ac.contact_id = contact.id
* @param int $userID use this userID if set
* @param string $from
* @param array $attachments the array of attachments if any
* @param string $cc cc rec
e
pient
* @param string $bcc bcc rec
e
pient
* @param string $cc cc rec
i
pient
* @param string $bcc bcc rec
i
pient
* @param array $contactIds contact ids
*
* @return array ( sent, activityId) if any email is sent and activityId
...
...
@@ -1737,7 +1737,7 @@ WHERE activity.id IN ($activityIds)";
/**
* Function to add activity for Membership/Event/Contribution
*
* @param object $activity (reference) p
e
rticular component object
* @param object $activity (reference) p
a
rticular component object
* @param string $activityType for Membership Signup or Renewal
*
*
...
...
@@ -1848,11 +1848,11 @@ SELECT display_name
}
/**
* Function to get Parent activity for currently viewd activity
* Function to get Parent activity for currently view
e
d activity
*
* @param int $activityId current activity id
*
* @return int $parentId Id of parent ac
y
ivity otherwise false.
* @return int $parentId Id of parent ac
t
ivity otherwise false.
* @access public
*/
static
function
getParentActivity
(
$activityId
)
{
...
...
@@ -1879,7 +1879,7 @@ SELECT display_name
*
* @param int $activityId current activity id
*
* @return int $params count of prior ac
y
ivities otherwise false.
* @return int $params count of prior ac
t
ivities otherwise false.
* @access public
*/
static
function
getPriorCount
(
$activityID
)
{
...
...
@@ -1912,11 +1912,12 @@ AND id < {$activityID}
}
/**
* Function to get all prior activities of currently viewd activity
* Function to get all prior activities of currently viewe
* d activity
*
* @param int $activityId current activity id
*
* @return array $result prior ac
y
ivities info.
* @return array $result prior ac
t
ivities info.
* @access public
*/
static
function
getPriorAcitivities
(
$activityID
,
$onlyPriorRevisions
=
FALSE
)
{
...
...
This diff is collapsed.
Click to expand it.
CRM/Case/BAO/Case.php
+
3
−
3
View file @
6ba89ab6
...
...
@@ -34,7 +34,7 @@
*/
/**
* This class contains the funtions for Case Management
* This class contains the fun
c
tions for Case Management
*
*/
class
CRM_Case_BAO_Case
extends
CRM_Case_DAO_Case
{
...
...
@@ -1604,7 +1604,7 @@ SELECT case_status.label AS case_status, status_id, case_type.label AS case_type
}
/**
* Function to retrive the scheduled activity type and date
* Function to retri
e
ve the scheduled activity type and date
*
* @param array $cases Array of contact and case id
*
...
...
@@ -1814,7 +1814,7 @@ SELECT case_status.label AS case_status, status_id, case_type.label AS case_type
*
* @param int $caseID case id
* @param int $relationshipId relationship id
* @param int $relContactId case role assigne contactId.
* @param int $relContactId case role assigne
e
contactId.
*
* @return void on success creates activity and case activity
*
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment