Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-23-18-25-12

[civicrm-core.git] / CRM / Activity / Task.php

diff --git a/CRM/Activity/Task.php b/CRM/Activity/Task.php
index ac011aab9388a001af8b30d48fb9763b264f4fa9..032f6a92f8d382433b1e6e1de5aae69c7bbdf374 100644 (file)
--- a/CRM/Activity/Task.php
+++ b/CRM/Activity/Task.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -27,7 +27,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -73,46 +73,63 @@ class CRM_Activity_Task {
   static function &tasks() {
     if (!(self::$_tasks)) {
       self::$_tasks = array(
-        1 => array('title' => ts('Delete Activities'),
+        1 => array(
+          'title' => ts('Delete Activities'),
           'class' => 'CRM_Activity_Form_Task_Delete',
           'result' => FALSE,
         ),
-        2 => array('title' => ts('Print Activities'),
+        2 => array(
+          'title' => ts('Print Selected Rows'),
           'class' => 'CRM_Activity_Form_Task_Print',
           'result' => FALSE,
         ),
-        3 => array('title' => ts('Export Activities'),
+        3 => array(
+          'title' => ts('Export Activities'),
           'class' => array(
             'CRM_Export_Form_Select',
             'CRM_Export_Form_Map',
           ),
           'result' => FALSE,
         ),
-        4 => array('title' => ts('Batch Update Activities Via Profile'),
+        4 => array(
+          'title' => ts('Batch Update Activities Via Profile'),
           'class' => array(
             'CRM_Activity_Form_Task_PickProfile',
             'CRM_Activity_Form_Task_Batch',
           ),
           'result' => FALSE,
         ),
-        5 => array('title' => ts('Send Email to Contacts'),
+        5 => array(
+          'title' => ts('Send Email to Contacts'),
           'class' => array(
             'CRM_Activity_Form_Task_PickOption',
             'CRM_Activity_Form_Task_Email',
           ),
           'result' => FALSE,
         ),
-        6 => array('title' => ts('Send Reply SMS To Contacts'),
+        6 => array(
+          'title' => ts('Send Reply SMS To Contacts'),
           'class' => 'CRM_Activity_Form_Task_SMS',
           'result' => FALSE,
         ),
+        7 => array(
+          'title' => ts('Tag Activities (assign tags)'),
+          'class' => 'CRM_Activity_Form_Task_AddToTag',
+          'result' => FALSE,
+        ),
+        8 => array(
+          'title' => ts('Untag Activities (remove tags)'),
+          'class' => 'CRM_Activity_Form_Task_RemoveFromTag',
+          'result' => FALSE,
+        ),
       );
 
       $config = CRM_Core_Config::singleton();
       if (in_array('CiviCase', $config->enableComponents)) {
         if ( CRM_Core_Permission::check('access all cases and activities') ||
           CRM_Core_Permission::check('access my cases and activities') ) {
-          self::$_tasks[6] = array('title' => ts('File on Case'),
+          self::$_tasks[6] = array(
+            'title' => ts('File on Case'),
             'class' => 'CRM_Activity_Form_Task_FileOnCase',
             'result' => FALSE,
           );
@@ -141,10 +158,7 @@ class CRM_Activity_Task {
     self::tasks();
     $titles = array();
     foreach (self::$_tasks as $id => $value) {
-      // skip Print Activity task
-      if ($id != 2) {
-        $titles[$id] = $value['title'];
-      }
+      $titles[$id] = $value['title'];
     }
     return $titles;
   }