-
-
Notifications
You must be signed in to change notification settings - Fork 168
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixes relationships issues to be able to display phone of the household
of the contact best practices : moving the location related code to the location objects adding the possibility to choose location and type in field for Instant Messaging and Website
- Loading branch information
Véronique Gratioulet
committed
Sep 6, 2016
1 parent
42336ea
commit f091f4c
Showing
11 changed files
with
585 additions
and
155 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| <?php | ||
| /* | ||
| +--------------------------------------------------------------------+ | ||
| | CiviCRM version 4.7 | | ||
| +--------------------------------------------------------------------+ | ||
| | 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 | | ||
| +--------------------------------------------------------------------+ | ||
| */ | ||
|
|
||
| /** | ||
| * Field handler for Instant Messaging field | ||
| * | ||
| * @ingroup civicrm_field_handlers | ||
| */ | ||
| class civicrm_handler_field_im extends civicrm_handler_field_location { | ||
| static $_provider; | ||
|
|
||
| function construct() { | ||
| parent::construct(); | ||
| if (!self::$_provider) { | ||
| if (!civicrm_initialize()) { | ||
| return; | ||
| } | ||
| self::$_provider = CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id'); | ||
| } | ||
| } | ||
|
|
||
| function option_definition() { | ||
| $options = parent::option_definition(); | ||
| $options['provider'] = array('default' => 0); | ||
| return $options; | ||
| } | ||
|
|
||
| function options_form(&$form, &$form_state) { | ||
| parent::options_form($form, $form_state); | ||
| $imOptions = array(0 => 'Any'); | ||
| foreach (self::$_provider as $id => $type) { | ||
| $imOptions[$id] = $type; | ||
| } | ||
| $form['provider'] = array( | ||
| '#type' => 'radios', | ||
| '#title' => 'Instant Messaging provider for this field', | ||
| '#options' => $imOptions, | ||
| '#description' => t('Instant Messaging provider to be displayed for this field'), | ||
| '#default_value' => $this->options['provider'], | ||
| '#fieldset' => 'location_choices', | ||
| ); | ||
| } | ||
|
|
||
| function join_im($join = array()) { | ||
| $extra = array(); | ||
| if (isset($join->extra)) { | ||
| $extra = $join->extra; | ||
| } | ||
| if (isset($this->options['provider']) && $this->options['provider']) { | ||
| $extra[] = array( | ||
| 'value' => $this->options['provider'], | ||
| 'numeric' => TRUE, | ||
| 'field' => 'provider_id', | ||
| 'operator' => '=', | ||
| ); | ||
| } | ||
| if (!empty($extra)) { | ||
| $join->extra = $extra; | ||
| } | ||
| return $join; | ||
| } | ||
|
|
||
| function get_join() { | ||
| $join = parent::get_join(); | ||
| $join = $this->join_im($join); | ||
| return $join; | ||
| } | ||
|
|
||
| function ensure_my_table() { | ||
| if (!isset($this->table_alias)) { | ||
| if (!method_exists($this->query, 'ensure_table')) { | ||
| vpr_trace(); | ||
| exit; | ||
| } | ||
| $join = $this->get_join(); | ||
| $this->table_alias = $this->query->ensure_table($this->table, $this->relationship, $join); | ||
| } | ||
| return $this->table_alias; | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.