From 9147c186f48d53e57090ef31c813d51bb106e550 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 6 Jan 2015 13:21:23 -0800 Subject: [PATCH] INFRA-132 - CRM/UF - phpcbf --- CRM/UF/Form/Field.php | 6 +++--- CRM/UF/Form/Group.php | 6 +++--- CRM/UF/Page/Group.php | 5 +++-- CRM/UF/Page/ProfileEditor.php | 9 +++++++++ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/CRM/UF/Form/Field.php b/CRM/UF/Form/Field.php index d26a6848e7..4217ab8101 100644 --- a/CRM/UF/Form/Field.php +++ b/CRM/UF/Form/Field.php @@ -107,7 +107,8 @@ class CRM_UF_Form_Field extends CRM_Core_Form { $session = CRM_Core_Session::singleton(); $session->pushUserContext($url); - $breadCrumb = array(array('title' => ts('CiviCRM Profile Fields'), + $breadCrumb = array(array( + 'title' => ts('CiviCRM Profile Fields'), 'url' => $url, )); CRM_Utils_System::appendBreadCrumb($breadCrumb); @@ -527,7 +528,6 @@ class CRM_UF_Form_Field extends CRM_Core_Form { $ids['uf_field'] = $this->_id; } - $name = NULL; if (isset($params['field_name'][1]) && isset($this->_selectFields[$params['field_name'][1]])) { // we dont get a name for a html formatting element @@ -731,7 +731,7 @@ class CRM_UF_Form_Field extends CRM_Core_Form { foreach ($groupFields as $groupField) { // if it is a phone - if ($groupField['where'] == $whereCheck && is_null($groupField['location_type_id']) && $groupField['field_id'] != $fieldID) { + if ($groupField['where'] == $whereCheck && is_null($groupField['location_type_id']) && $groupField['field_id'] != $fieldID) { $primaryOfSameTypeFound = $groupField['title']; break; } diff --git a/CRM/UF/Form/Group.php b/CRM/UF/Form/Group.php index bd992d50da..cbb7a55e8d 100644 --- a/CRM/UF/Form/Group.php +++ b/CRM/UF/Form/Group.php @@ -139,7 +139,6 @@ class CRM_UF_Form_Group extends CRM_Core_Form { $this->add('text', 'title', ts('Profile Name'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_UFGroup', 'title'), TRUE); $this->add('textarea', 'description', ts('Description'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_UFGroup', 'description')); - //add checkboxes $uf_group_type = array(); $UFGroupType = CRM_Core_SelectValues::ufGroupTypes(); @@ -299,8 +298,9 @@ class CRM_UF_Form_Group extends CRM_Core_Form { $name = CRM_Utils_String::munge($title, '_', 56); $name .= $self->_id ? '_' . $self->_id : ''; $query = 'select count(*) from civicrm_uf_group where ( name like %1 ) and id != %2'; - $pCnt = CRM_Core_DAO::singleValueQuery($query, array(1 => array($name, 'String'), - 2 => array((int)$self->_id, 'Integer'), + $pCnt = CRM_Core_DAO::singleValueQuery($query, array( + 1 => array($name, 'String'), + 2 => array((int) $self->_id, 'Integer'), )); if ($pCnt) { $errors['title'] = ts('Profile \'%1\' already exists in Database.', array(1 => $title)); diff --git a/CRM/UF/Page/Group.php b/CRM/UF/Page/Group.php index d903f3df53..cde6f25206 100644 --- a/CRM/UF/Page/Group.php +++ b/CRM/UF/Page/Group.php @@ -87,14 +87,14 @@ class CRM_UF_Page_Group extends CRM_Core_Page { 'url' => 'civicrm/profile/create', 'qs' => 'gid=%%id%%&reset=1', 'title' => ts('Use Profile-Create Mode'), - 'fe' => true, + 'fe' => TRUE, ), CRM_Core_Action::BASIC => array( 'name' => ts('Use Profile-Listings Mode'), 'url' => 'civicrm/profile', 'qs' => 'gid=%%id%%&reset=1', 'title' => ts('Use Profile-Listings Mode'), - 'fe' => true, + 'fe' => TRUE, ), CRM_Core_Action::DISABLE => array( 'name' => ts('Disable'), @@ -471,6 +471,7 @@ class CRM_UF_Page_Group extends CRM_Core_Page { $typeName = 'Activity'; $valueLabels = CRM_Core_PseudoConstant::ActivityType(TRUE, TRUE, FALSE, 'label', TRUE); break; + case 'CaseType': $typeName = 'Case'; $valueLabels = CRM_Case_PseudoConstant::caseType(); diff --git a/CRM/UF/Page/ProfileEditor.php b/CRM/UF/Page/ProfileEditor.php index c6656c29e4..d1875fff47 100644 --- a/CRM/UF/Page/ProfileEditor.php +++ b/CRM/UF/Page/ProfileEditor.php @@ -114,6 +114,7 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page { $availableFields ); break; + case 'OrganizationModel': $civiSchema[$entityType] = self::convertCiviModelToBackboneModel( 'Organization', @@ -121,6 +122,7 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page { $availableFields ); break; + case 'HouseholdModel': $civiSchema[$entityType] = self::convertCiviModelToBackboneModel( 'Household', @@ -128,6 +130,7 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page { $availableFields ); break; + case 'ActivityModel': $civiSchema[$entityType] = self::convertCiviModelToBackboneModel( 'Activity', @@ -135,6 +138,7 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page { $availableFields ); break; + case 'ContributionModel': $civiSchema[$entityType] = self::convertCiviModelToBackboneModel( 'Contribution', @@ -142,6 +146,7 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page { $availableFields ); break; + case 'MembershipModel': $civiSchema[$entityType] = self::convertCiviModelToBackboneModel( 'Membership', @@ -149,6 +154,7 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page { $availableFields ); break; + case 'ParticipantModel': $civiSchema[$entityType] = self::convertCiviModelToBackboneModel( 'Participant', @@ -156,6 +162,7 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page { $availableFields ); break; + case 'CaseModel': $civiSchema[$entityType] = self::convertCiviModelToBackboneModel( 'Case', @@ -163,6 +170,7 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page { $availableFields ); break; + default: throw new CRM_Core_Exception("Unrecognized entity type: $entityType"); } @@ -205,6 +213,7 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page { continue 2; } break; + default: if ($field['field_type'] != $extends) { continue 2; -- 2.25.1