projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-15832 - Update various modules to use crmResource
[civicrm-core.git]
/
CRM
/
Mailing
/
Info.php
diff --git
a/CRM/Mailing/Info.php
b/CRM/Mailing/Info.php
index e29cd28d4cea16104be80d28411ec9fa431dedc2..9457998717b618cd46099f47c5de100101649c01 100644
(file)
--- a/
CRM/Mailing/Info.php
+++ b/
CRM/Mailing/Info.php
@@
-37,12
+37,14
@@
*/
class CRM_Mailing_Info extends CRM_Core_Component_Info {
*/
class CRM_Mailing_Info extends CRM_Core_Component_Info {
- // docs inherited from interface
+ /**
+ * @inheritDoc
+ */
protected $keyword = 'mailing';
protected $keyword = 'mailing';
- // docs inherited from interface
/**
/**
+ * @inheritDoc
* @return array
*/
public function getInfo() {
* @return array
*/
public function getInfo() {
@@
-59,17
+61,28
@@
class CRM_Mailing_Info extends CRM_Core_Component_Info {
$result = array();
$result['crmMailing'] = array(
'ext' => 'civicrm',
$result = array();
$result['crmMailing'] = array(
'ext' => 'civicrm',
- 'js' => array('js/angular-crmMailing.js', 'js/angular-crmMailing/services.js', 'js/angular-crmMailing/directives.js'),
+ 'js' => array(
+ 'js/angular-crmMailing.js',
+ 'js/angular-crmMailing/*.js',
+ ),
'css' => array('css/angular-crmMailing.css'),
'css' => array('css/angular-crmMailing.css'),
+ 'partials' => array('partials/crmMailing'),
);
$result['crmMailingAB'] = array(
'ext' => 'civicrm',
);
$result['crmMailingAB'] = array(
'ext' => 'civicrm',
- 'js' => array('js/angular-crmMailingAB.js', 'js/angular-crmMailingAB/services.js', 'js/angular-crmMailingAB/directives.js'),
+ 'js' => array(
+ 'js/angular-crmMailingAB.js',
+ 'js/angular-crmMailingAB/*.js',
+ ),
'css' => array('css/angular-crmMailingAB.css'),
'css' => array('css/angular-crmMailingAB.css'),
+ 'partials' => array('partials/crmMailingAB'),
);
$result['crmD3'] = array(
'ext' => 'civicrm',
);
$result['crmD3'] = array(
'ext' => 'civicrm',
- 'js' => array('js/angular-crmD3.js', 'bower_components/d3/d3.min.js'),
+ 'js' => array(
+ 'js/angular-crmD3.js',
+ 'bower_components/d3/d3.min.js',
+ ),
);
$config = CRM_Core_Config::singleton();
);
$config = CRM_Core_Config::singleton();
@@
-100,7
+113,7
@@
class CRM_Mailing_Info extends CRM_Core_Component_Info {
'contact_id' => $contactID,
));
$mesTemplate = civicrm_api3('MessageTemplate', 'get', array(
'contact_id' => $contactID,
));
$mesTemplate = civicrm_api3('MessageTemplate', 'get', array(
- 'sequential' => 1,
+
'sequential' => 1,
'return' => array("msg_html", "id", "msg_title", "msg_subject", "msg_text"),
'workflow_id' => array('IS NULL' => ""),
));
'return' => array("msg_html", "id", "msg_title", "msg_subject", "msg_text"),
'workflow_id' => array('IS NULL' => ""),
));
@@
-127,10
+140,13
@@
class CRM_Mailing_Info extends CRM_Core_Component_Info {
'contactid' => $contactID,
'enableReplyTo' => isset($config->replyTo) ? $config->replyTo : 0,
'fromAddress' => array_values($fromAddress['values'][0]['api.OptionValue.get']['values']),
'contactid' => $contactID,
'enableReplyTo' => isset($config->replyTo) ? $config->replyTo : 0,
'fromAddress' => array_values($fromAddress['values'][0]['api.OptionValue.get']['values']),
- 'defaultTestEmail' => civicrm_api3('Contact', 'getvalue', array('id' => 'user_contact_id', 'return' => 'email')),
+ 'defaultTestEmail' => civicrm_api3('Contact', 'getvalue', array(
+ 'id' => 'user_contact_id',
+ 'return' => 'email',
+ )),
'visibility' => array(
'visibility' => array(
-
array('value' => 'Public Pages', 'label' => ts('Public Pages')),
-
array('value' => 'User and User Admin Only', 'label' => ts('User and User Admin Only')),
+ array('value' => 'Public Pages', 'label' => ts('Public Pages')),
+ array('value' => 'User and User Admin Only', 'label' => ts('User and User Admin Only')),
),
),
));
),
),
));
@@
-166,8
+182,8
@@
class CRM_Mailing_Info extends CRM_Core_Component_Info {
) ? TRUE : FALSE;
}
) ? TRUE : FALSE;
}
- // docs inherited from interface
/**
/**
+ * @inheritDoc
* @param bool $getAllUnconditionally
*
* @return array
* @param bool $getAllUnconditionally
*
* @return array
@@
-190,8
+206,8
@@
class CRM_Mailing_Info extends CRM_Core_Component_Info {
}
}
- // docs inherited from interface
/**
/**
+ * @inheritDoc
* @return null
*/
public function getUserDashboardElement() {
* @return null
*/
public function getUserDashboardElement() {
@@
-207,8
+223,8
@@
class CRM_Mailing_Info extends CRM_Core_Component_Info {
return NULL;
}
return NULL;
}
- // docs inherited from interface
/**
/**
+ * @inheritDoc
* @return array
*/
public function registerTab() {
* @return array
*/
public function registerTab() {
@@
-220,27
+236,27
@@
class CRM_Mailing_Info extends CRM_Core_Component_Info {
);
}
);
}
- // docs inherited from interface
/**
/**
+ * @inheritDoc
* @return array
*/
public function registerAdvancedSearchPane() {
return array(
* @return array
*/
public function registerAdvancedSearchPane() {
return array(
- 'title' => ts('Mailings'),
+
'title' => ts('Mailings'),
'weight' => 20,
);
}
'weight' => 20,
);
}
- // docs inherited from interface
/**
/**
+ * @inheritDoc
* @return null
*/
public function getActivityTypes() {
return NULL;
}
* @return null
*/
public function getActivityTypes() {
return NULL;
}
- // add shortcut to Create New
/**
/**
+ * add shortcut to Create New
* @param $shortCuts
*/
public function creatNewShortcut(&$shortCuts) {
* @param $shortCuts
*/
public function creatNewShortcut(&$shortCuts) {