Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 7 commits
  • 14 files changed
  • 0 commit comments
  • 1 contributor
View
6 civicrm/custom/php/CRM/Activity/Form/Activity.php
@@ -172,7 +172,7 @@ function setFields()
'followup_activity_type_id' => array( 'type' => 'select',
'label' => ts('Followup Activity'),
'attributes' => array( '' => '- '.ts('select activity').' -' ) +
- CRM_Core_PseudoConstant::ActivityType( false ),
+ asort(CRM_Core_PseudoConstant::ActivityType( false )), //NYSS 4921
),
'interval' => array( 'type' => 'text',
'label' => 'in',
@@ -657,8 +657,10 @@ public function buildQuickForm( )
//enable form element (ActivityLinks sets this true)
$this->assign( 'suppressForm', false );
+ $activityTypes = asort($this->_fields['followup_activity_type_id']['attributes']); //NYSS 4921
+
$element =& $this->add('select', 'activity_type_id', ts('Activity Type'),
- $this->_fields['followup_activity_type_id']['attributes'],
+ $activityTypes, //NYSS 4921
false, array('onchange' =>
"buildCustomData( 'Activity', this.value );") );
View
3  civicrm/custom/php/CRM/Activity/Form/ActivityLinks.php
@@ -68,7 +68,8 @@ public function buildQuickForm( ) {
$otherTypes = CRM_Core_PseudoConstant::activityType( false );
$activityTypes += $otherTypes;
- unset( $activityTypes[22] ); //NYSS - LCD remove Print PDF option from contact actions list #2435
+ asort($activityTypes); //NYSS 4921
+ //unset( $activityTypes[22] ); //NYSS - LCD remove Print PDF option from contact actions list #2435
foreach( array_keys($activityTypes) as $typeId ) {
if ( $typeId == $emailTypeId ) {
View
8 civicrm/custom/php/CRM/Contact/Form/Search/Custom/Proximity.php
@@ -132,6 +132,9 @@ function buildForm( &$form ) {
$country = array( '' => ts('- select -') ) + CRM_Core_PseudoConstant::country( );
$form->add( 'select', 'country_id', ts('Country'), $country, true );
+ // Allow user to choose which type of contact to limit search on
+ $form->add('select', 'contact_type', ts('Find...'), CRM_Core_SelectValues::contactType());
+
$group =
array('' => ts('- any group -')) +
CRM_Core_PseudoConstant::group( );
@@ -164,6 +167,7 @@ function buildForm( &$form ) {
'postal_code',
'country_id',
'state_province_id',
+ 'contact_type',
'group',
'tag' ) );
}
@@ -233,6 +237,10 @@ function where( $includeContactIDs = false ) {
";
}
+ if (! empty($this->_formValues['contact_type']) ) {
+ $where .= " AND contact_a.contact_type LIKE '%{$this->_formValues['contact_type']}%'";
+ }
+
//NYSS standard clauses
$where .= " AND is_deleted = 0 AND is_deceased = 0 ";
View
15 civicrm/custom/php/CRM/Core/BAO/Dashboard.php
@@ -67,6 +67,21 @@ static function getDashlets( $all = true ) {
if ( !self::checkPermission( $dao->permission, $dao->permission_operator ) ) {
continue;
}
+
+ //NYSS 3439 also check for group based permission if created from report
+ if ( strpos($dao->url, 'civicrm/report/instance/') !== false ) {
+
+ require_once 'CRM/Report/Utils/Report.php';
+
+ $end = strpos($dao->url, "&");
+ $instanceID = substr($dao->url, 24, $end-24);
+ //CRM_Core_Error::debug_var('instanceID',$instanceID);
+
+ if ( $instanceID &&
+ !CRM_Report_Utils_Report::isInstanceGroupRoleAllowed($instanceID) ) {
+ continue;
+ }
+ }
$values = array( );
CRM_Core_DAO::storeValues( $dao, $values );
View
22 civicrm/custom/php/CRM/Dashlet/Page/News.php
@@ -55,19 +55,25 @@ function rss_to_array($tag, $array, $url) {
$doc->load($url);
$rss_array = array();
$items = array();
+ $i = 0;
foreach($doc->getElementsByTagName($tag) AS $node) {
- foreach($array AS $key => $value) {
+ //only show the 5 most recent posts
+ if ( $i > 4 ) {
+ break;
+ }
+ foreach($array AS $key => $value) {
$items[$value] = $node->getElementsByTagName($value)->item(0)->nodeValue;
- if ( $value == 'pubDate' ) {
- $items[$value] = date("l, M j, Y g:ia", strtotime($items[$value]));
- }
+ if ( $value == 'pubDate' ) {
+ $items[$value] = date("l, M j, Y g:ia", strtotime($items[$value]));
+ }
}
array_push($rss_array, $items);
+ $i++;
}
return $rss_array;
}
-
- $rss_tags = array( 'title',
+
+ $rss_tags = array( 'title',
'pubDate',
'description',
'link',
@@ -82,8 +88,8 @@ function rss_to_array($tag, $array, $url) {
$rssfeed = rss_to_array($rss_item_tag,$rss_tags,$rss_url);
//CRM_Core_Error::debug($rssfeed);
-
- $this->assign('newsfeed', $rssfeed);
+
+ $this->assign('newsfeed', $rssfeed);
return parent::run( );
}
View
48 civicrm/custom/php/CRM/Logging/Schema.php
@@ -107,7 +107,9 @@ function disableLogging()
{
if (!$this->isEnabled()) return;
- $this->dropTriggers();
+ //$this->dropTriggers();
+ //NYSS invoke the meta trigger creation call
+ CRM_Core_DAO::triggerRebuild( );
$this->deleteReports();
}
@@ -274,37 +276,6 @@ private function createLogTableFor($table)
}
/**
- * Create triggers populating the relevant log table every time the given table changes.
- */
- function createTriggersFor($table)
- {
- if ($table != 'civicrm_contact' and !$this->isEnabled()) return;
-
- $columns = $this->columnsOf($table);
-
- $queries = array();
- foreach (array('Insert', 'Update', 'Delete') as $action) {
- $trigger = "{$table}_after_" . strtolower($action);
- $queries[] = "DROP TRIGGER IF EXISTS $trigger";
- $query = "CREATE TRIGGER $trigger AFTER $action ON $table FOR EACH ROW INSERT INTO `{$this->db}`.log_$table (";
- foreach ($columns as $column) {
- $query .= "$column, ";
- }
- $query .= "log_conn_id, log_user_id, log_action) VALUES (";
- foreach ($columns as $column) {
- $query .= $action == 'Delete' ? "OLD.$column, " : "NEW.$column, ";
- }
- $query .= "CONNECTION_ID(), @civicrm_user_id, '$action')";
- $queries[] = $query;
- }
-
- $dao = new CRM_Core_DAO;
- foreach ($queries as $query) {
- $dao->executeQuery($query);
- }
- }
-
- /**
* Create triggers for all logged tables.
*/
/*private function createTriggers()
@@ -335,19 +306,6 @@ private function deleteReports()
}
/**
- * Drop triggers for all logged tables.
- */
- private function dropTriggers()
- {
- $dao = new CRM_Core_DAO;
- foreach ($this->tables as $table) {
- $dao->executeQuery("DROP TRIGGER IF EXISTS {$table}_after_insert");
- $dao->executeQuery("DROP TRIGGER IF EXISTS {$table}_after_update");
- $dao->executeQuery("DROP TRIGGER IF EXISTS {$table}_after_delete");
- }
- }
-
- /**
* Predicate whether logging is enabled.
*/
public function isEnabled()
View
3  civicrm/custom/php/CRM/Mailing/Page/View.php
@@ -67,7 +67,8 @@ function checkPermission( )
// if user is an admin, return true
if ( CRM_Core_Permission::check( 'administer CiviCRM' ) ||
CRM_Core_Permission::check( 'access CiviMail' ) ||
- CRM_Core_Permission::check( 'create mailings' ) ) { //NYSS
+ CRM_Core_Permission::check( 'create mailings' ) ||
+ CRM_Core_Permission::check( 'view mass email' ) ) { //NYSS
return true;
}
View
6 civicrm/custom/php/CRM/Report/Form/ActivityTag.php
@@ -44,7 +44,8 @@ class CRM_Report_Form_ActivityTag extends CRM_Report_Form {
function __construct( ) {
-
+ $activityTypes = CRM_Core_PseudoConstant::activityType(true, true, false, 'label', true);
+ asort($activityTypes);
$this->_columns = array(
'civicrm_tag' =>
@@ -95,7 +96,8 @@ function __construct( ) {
'activity_type_id' =>
array( 'title' => ts( 'Activity Type' ),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
- 'options' => CRM_Core_PseudoConstant::activityType(true, true, false, 'label', true), ),
+ 'options' => $activityTypes,
+ ),
'status_id' =>
array( 'title' => ts( 'Activity Status' ),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
View
17 civicrm/custom/php/CRM/Report/Form/Instance.php
@@ -40,18 +40,19 @@
class CRM_Report_Form_Instance {
static function buildForm( &$form ) {
+
+ //NYSS check role based permission; do this first so it also affect dashlet mode
+ $instanceID = $form->getVar( '_id' );
+ if ( $instanceID && !CRM_Report_Utils_Report::isInstanceGroupRoleAllowed($instanceID) ) {
+ $url = CRM_Utils_System::url( 'civicrm/report/list', 'reset=1' );
+ CRM_Core_Error::statusBounce( ts( 'You do not have permission to access this report.' ),
+ $url );
+ }
+
// we should not build form elements in dashlet mode
if ( $form->_section ) {
return;
}
-
- //NYSS check role based permission
- $instanceID = $form->getVar( '_id' );
- if ( $instanceID && !CRM_Report_Utils_Report::isInstanceGroupRoleAllowed($instanceID) ) {
- $url = CRM_Utils_System::url( 'civicrm/report/list', 'reset=1' );
- CRM_Core_Error::statusBounce( ts( 'You do not have permission to access this report.' ),
- $url );
- }
$attributes = CRM_Core_DAO::getAttribute( 'CRM_Report_DAO_Instance' );
View
155 civicrm/custom/templates/CRM/Activity/Form/ActivityView.tpl
@@ -0,0 +1,155 @@
+{*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 3.4 |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2011 |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM. |
+ | |
+ | CiviCRM is free software; you can copy, modify, and distribute it |
+ | under the terms of the GNU Affero General Public License |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
+ | |
+ | CiviCRM is distributed in the hope that it will be useful, but |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
+ | See the GNU Affero General Public License for more details. |
+ | |
+ | You should have received a copy of the GNU Affero General Public |
+ | License and the CiviCRM Licensing Exception along |
+ | with this program; if not, contact CiviCRM LLC |
+ | at info[AT]civicrm[DOT]org. If you have questions about the |
+ | GNU Affero General Public License or the licensing of CiviCRM, |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+*}
+<h3>{$activityTypeName}</h3>
+<div class="crm-block crm-content-block crm-activity-view-block">
+ {if $activityTypeDescription}
+ <div id="help">{$activityTypeDescription}</div>
+ {/if}
+ <table class="crm-info-panel">
+ <tr>
+ <td class="label">{ts}Added By{/ts}</td><td class="view-value">{$values.source_contact}</td>
+ </tr>
+ {if $values.target_contact_value}
+ <tr>
+ <td class="label">{ts}With Contact{/ts}</td><td class="view-value">{$values.target_contact_value}</td>
+ </tr>
+ {/if}
+ {if $values.mailingId}
+ <tr>
+ <td class="label">{ts}With Contact{/ts}</td><td class="view-value">
+ {*NYSS 4933*}
+ {if call_user_func(array('CRM_Core_Permission','check'), 'access CiviMail') or
+ call_user_func(array('CRM_Core_Permission','check'), 'create mailings')}
+ <a href="{$values.mailingId}" title="{ts}View Mailing Report{/ts}">&raquo;{ts}Mailing Report{/ts}</a>
+ {else}
+ Mass Email Recipients
+ {/if}
+ </td>
+ </tr>
+ {/if}
+ <tr>
+ <td class="label">{ts}Subject{/ts}</td><td class="view-value">{$values.subject}</td>
+ </tr>
+
+ {if $values.campaign}
+ <tr>
+ <td class="label">{ts}Campaign{/ts}</td><td class="view-value">{$values.campaign}</td>
+ </tr>
+ {/if}
+
+ {if $values.engagement_level AND
+ call_user_func( array( 'CRM_Campaign_BAO_Campaign', 'isCampaignEnable' ) )}
+ <td class="label">{ts}Engagement Level{/ts}</td><td class="view-value">{$values.engagement_level}</td>
+ {/if}
+
+ <tr>
+ <td class="label">{ts}Date and Time{/ts}</td><td class="view-value">{$values.activity_date_time|crmDate }</td>
+ </tr>
+ {if $values.mailingId}
+ <tr>
+ <td class="label">{ts}Details{/ts}</td>
+ <td class="view-value report">
+
+ <fieldset>
+ <legend>{ts}Content / Components{/ts}</legend>
+ {strip}
+ <table class="form-layout-compressed">
+ {*NYSS 4933*}
+ {if $mailingReport.mailing.body_text and
+ ( call_user_func(array('CRM_Core_Permission','check'), 'access CiviMail') or
+ call_user_func(array('CRM_Core_Permission','check'), 'create mailings') ) }
+ <tr>
+ <td class="label nowrap">{ts}Text Message{/ts}</td>
+ <td>
+ {$mailingReport.mailing.body_text|mb_truncate:30|escape|nl2br}
+ <br />
+ {if $values.mailingId}
+ <strong><a href='{$textViewURL}'>&raquo; {ts}View complete message{/ts}</a></strong>
+ {/if}
+ </td>
+ </tr>
+ {/if}
+
+ {*NYSS 4933*}
+ {if $mailingReport.mailing.body_html and
+ ( call_user_func(array('CRM_Core_Permission','check'), 'access CiviMail') or
+ call_user_func(array('CRM_Core_Permission','check'), 'create mailings') ) }
+ <tr>
+ <td class="label nowrap">{ts}HTML Message{/ts}</td>
+ <td>
+ {$mailingReport.mailing.body_html|mb_truncate:30|escape|nl2br}
+ <br/>
+ {if $values.mailingId}
+ <strong><a href='{$htmlViewURL}'>&raquo; {ts}View complete message{/ts}</a></strong>
+ {/if}
+ </td>
+ </tr>
+ {/if}
+
+ {*NYSS 4933*}
+ {if call_user_func(array('CRM_Core_Permission','check'), 'view mass email')}
+ <tr>
+ <td class="label nowrap">{ts}Message Content{/ts}</td>
+ <td>
+ {if $mailingReport.mailing.body_html}
+ {$mailingReport.mailing.body_html|mb_truncate:30|escape|nl2br}
+ {else if $mailingReport.mailing.body_text}
+ {$mailingReport.mailing.body_text|mb_truncate:30|escape|nl2br}
+ {/if}
+ <br/>
+ <strong><a href="javascript:popUp('{crmURL p='civicrm/mailing/view' q="id=`$mailingReport.mailing.id`&reset=1"}')">&raquo; {ts}View complete message{/ts}</a></strong>
+ </td>
+ </tr>
+ {/if}
+
+ {if $mailingReport.mailing.attachment}
+ <tr>
+ <td class="label nowrap">{ts}Attachments{/ts}</td>
+ <td>
+ {$mailingReport.mailing.attachment}
+ </td>
+ </tr>
+ {/if}
+
+ </table>
+ {/strip}
+ </fieldset>
+ </td>
+ </tr>
+ {else}
+ <tr>
+ <td class="label">{ts}Details{/ts}</td><td class="view-value report">{$values.details|crmStripAlternatives|nl2br}</td>
+ </tr>
+ {/if}
+{if $values.attachment}
+ <tr>
+ <td class="label">{ts}Attachment(s){/ts}</td><td class="view-value report">{$values.attachment}</td>
+ </tr>
+{/if}
+ </table>
+ <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+</div>
+
View
142 civicrm/custom/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
@@ -0,0 +1,142 @@
+{*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 3.4 |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2011 |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM. |
+ | |
+ | CiviCRM is free software; you can copy, modify, and distribute it |
+ | under the terms of the GNU Affero General Public License |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
+ | |
+ | CiviCRM is distributed in the hope that it will be useful, but |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
+ | See the GNU Affero General Public License for more details. |
+ | |
+ | You should have received a copy of the GNU Affero General Public |
+ | License and the CiviCRM Licensing Exception along |
+ | with this program; if not, contact CiviCRM LLC |
+ | at info[AT]civicrm[DOT]org. If you have questions about the |
+ | GNU Affero General Public License or the licensing of CiviCRM, |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing |
+ +--------------------------------------------------------------------+
+*}
+{* Default template custom searches. This template is used automatically if templateFile() function not defined in
+ custom search .php file. If you want a different layout, clone and customize this file and point to new file using
+ templateFile() function.*}
+<div class="crm-block crm-form-block crm-contact-custom-search-form-block">
+<div class="crm-accordion-wrapper crm-custom_search_form-accordion {if $rows}crm-accordion-closed{else}crm-accordion-open{/if}">
+ <div class="crm-accordion-header crm-master-accordion-header">
+ <div class="icon crm-accordion-pointer"></div>
+ {ts}Edit Search Criteria{/ts}
+ </div><!-- /.crm-accordion-header -->
+ <div class="crm-accordion-body">
+ <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
+ <table class="form-layout-compressed">
+ <tr><td class="label">{$form.distance.label}</td><td>{$form.distance.html|crmReplace:class:four} {$form.prox_distance_unit.html}</td></tr>
+ <tr><td class="label">FROM...</td><td></td></tr>
+ <tr><td class="label">{$form.street_address.label}</td><td>{$form.street_address.html}</td></tr>
+ <tr><td class="label">{$form.city.label}</td><td>{$form.city.html}</td></tr>
+ <tr><td class="label">{$form.postal_code.label}</td><td>{$form.postal_code.html}</td></tr>
+ <tr><td class="label">{$form.country_id.label}</td><td>{$form.country_id.html}</td></tr>
+ <tr><td class="label" style="white-space: nowrap;">{$form.state_province_id.label}</td><td>{$form.state_province_id.html}</td></tr>
+ <tr><td class="label">AND ...</td><td></td></tr>
+ <tr><td class="label">{$form.contact_type.label}</td><td>{$form.contact_type.html}</td></tr>
+ <tr><td class="label">{$form.group.label}</td><td>{$form.group.html}</td></tr>
+ <tr><td class="label">{$form.tag.label}</td><td>{$form.tag.html}</td></tr>
+ </table>
+ <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+ </div><!-- /.crm-accordion-body -->
+</div><!-- /.crm-accordion-wrapper -->
+</div><!-- /.crm-form-block -->
+
+{if $rowsEmpty || $rows}
+<div class="crm-content-block">
+{if $rowsEmpty}
+ {include file="CRM/Contact/Form/Search/Custom/EmptyResults.tpl"}
+{/if}
+
+{if $summary}
+ {$summary.summary}: {$summary.total}
+{/if}
+
+{if $rows}
+ <div class="crm-results-block">
+ {* Search request has returned 1 or more matching rows. Display results and collapse the search criteria fieldset. *}
+ {* This section handles form elements for action task select and submit *}
+ <div class="crm-search-tasks">
+ {include file="CRM/Contact/Form/Search/ResultTasks.tpl"}
+ </div>
+ {* This section displays the rows along and includes the paging controls *}
+ <div class="crm-search-results">
+
+ {include file="CRM/common/pager.tpl" location="top"}
+
+ {* Include alpha pager if defined. *}
+ {if $atoZ}
+ {include file="CRM/common/pagerAToZ.tpl"}
+ {/if}
+
+ {strip}
+ <table class="selector" summary="{ts}Search results listings.{/ts}">
+ <thead class="sticky">
+ <th scope="col" title="Select All Rows">{$form.toggleSelect.html}</th>
+ {foreach from=$columnHeaders item=header}
+ <th scope="col">
+ {if $header.sort}
+ {assign var='key' value=$header.sort}
+ {$sort->_response.$key.link}
+ {else}
+ {$header.name}
+ {/if}
+ </th>
+ {/foreach}
+ <th>&nbsp;</th>
+ </thead>
+
+ {counter start=0 skip=1 print=false}
+ {foreach from=$rows item=row}
+ <tr id='rowid{$row.contact_id}' class="{cycle values="odd-row,even-row"}">
+ {assign var=cbName value=$row.checkbox}
+ <td>{$form.$cbName.html}</td>
+ {foreach from=$columnHeaders item=header}
+ {assign var=fName value=$header.sort}
+ {if $fName eq 'sort_name'}
+ <td><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.contact_id`"}">{$row.sort_name}</a></td>
+ {else}
+ <td>{$row.$fName}</td>
+ {/if}
+ {/foreach}
+ <td>{$row.action}</td>
+ </tr>
+ {/foreach}
+ </table>
+ {/strip}
+
+ <script type="text/javascript">
+ {* this function is called to change the color of selected row(s) *}
+ var fname = "{$form.formName}";
+ on_load_init_checkboxes(fname);
+ </script>
+
+ {include file="CRM/common/pager.tpl" location="bottom"}
+
+ </p>
+ {* END Actions/Results section *}
+ </div>
+ </div>
+{/if}
+
+
+
+</div>
+{/if}
+{literal}
+<script type="text/javascript">
+cj(function() {
+ cj().crmaccordions();
+});
+</script>
+{/literal}
View
8 modules/civicrm/CRM/Core/Invoke.php
@@ -72,6 +72,14 @@ static function invoke( $args )
// also reset navigation
require_once 'CRM/Core/BAO/Navigation.php';
CRM_Core_BAO_Navigation::resetNavigation( );
+
+ // also cleanup all caches //NYSS
+ $config->cleanupCaches( );
+
+ // also rebuild triggers if set //NYSS 5067
+ if ( CRM_Utils_Request::retrieve( 'triggerRebuild', 'Boolean', CRM_Core_DAO::$_nullObject, false, 0, 'GET' ) ) {
+ CRM_Core_DAO::triggerRebuild( );
+ }
return CRM_Utils_System::redirect( );
} else {
View
28 modules/nyss_civihooks/nyss_civihooks.module
@@ -390,6 +390,30 @@ function nyss_civihooks_civicrm_buildForm( $formName, &$form ) {
CRM_Utils_System::setTitle( ts('Bluebird') );
}
+ //4921
+ if ( $formName == 'CRM_Activity_Form_Activity' ) {
+ //resort activity type
+ if ( !$form->elementExists('activity_type_id') ) {
+ return;
+ }
+ $ele =& $form->getElement('activity_type_id');
+ $fele =& $form->getElement('followup_activity_type_id');
+ $aTypes = $eleOptions = $feleOptions = array();
+
+ foreach ( $ele->_options as $k => $aT ) {
+ $aTypes[$k] = $aT['text'];
+ }
+ asort($aTypes);
+ foreach( $aTypes as $k => $aT ) {
+ $eleOptions[$k] = array( 'text' => $ele->_options[$k]['text'],
+ 'attr' => $ele->_options[$k]['attr'] );
+ $feleOptions[$k] = array( 'text' => $fele->_options[$k]['text'],
+ 'attr' => $fele->_options[$k]['attr'] );
+ }
+ $ele->_options = $eleOptions;
+ $fele->_options = $feleOptions;
+ }
+
//CRM_Core_Error::debug($formName);
//CRM_Core_Error::debug($form);
@@ -422,8 +446,8 @@ function nyss_civihooks_civicrm_postProcess( $formName, &$form ) {
//check if all indivs related to the household are marked either do not email or do not mail
//if so, mark the household with those values and return a message
- if ( $values['do_not_email'] ||
- $values['do_not_mail'] ) {
+ if ( $values['privacy']['do_not_email'] ||
+ $values['privacy']['do_not_mail'] ) {
foreach ( $rels['values'] as $rel ) {
if ( ( $rel['relationship_type_id'] == 6 ||
View
4 modules/nyss_dashboards/nyss_dashboards.xml
@@ -37,12 +37,12 @@
<page_type>1</page_type>
<weight>625</weight>
</item>
- <!--NYSS 4239-->
+ <!--NYSS 4239/4933-->
<item>
<path>civicrm/mailing/view</path>
<title>View Mailing</title>
<page_callback>CRM_Mailing_Page_View</page_callback>
- <access_arguments>view public CiviMail content;access CiviMail;create mailings;schedule mailings;approve mailings</access_arguments>
+ <access_arguments>view public CiviMail content;access CiviMail;create mailings;schedule mailings;approve mailings;view mass email</access_arguments>
<is_public>true</is_public>
<weight>800</weight>
</item>

No commit comments for this range

Something went wrong with that request. Please try again.