X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCustom%2FForm%2FGroup.php;h=8f88a64ac70541e70fd09060704726290517bb3e;hb=95d8ddc04c08360567c00283822622fb8bcb0b35;hp=245d0a6ca4dc6c16ca68280a3c3c2a642cab7c22;hpb=dc195289d598fae6feedab517c4ababcdb840541;p=civicrm-core.git diff --git a/CRM/Custom/Form/Group.php b/CRM/Custom/Form/Group.php index 245d0a6ca4..8f88a64ac7 100644 --- a/CRM/Custom/Form/Group.php +++ b/CRM/Custom/Form/Group.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -69,7 +69,6 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { /** * Set variables up before form is built * - * @param null * * @return void */ @@ -114,21 +113,21 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { * @param $self * * - * @return true if no errors, else array of errors - * @static + * @return bool|array + * true if no errors, else array of errors */ public static function formRule($fields, $files, $self) { $errors = array(); //validate group title as well as name. - $title = $fields['title']; - $name = CRM_Utils_String::munge($title, '_', 64); - $query = 'select count(*) from civicrm_custom_group where ( name like %1 OR title like %2 ) and id != %3'; + $title = $fields['title']; + $name = CRM_Utils_String::munge($title, '_', 64); + $query = 'select count(*) from civicrm_custom_group where ( name like %1 OR title like %2 ) and id != %3'; $grpCnt = CRM_Core_DAO::singleValueQuery($query, array( - 1 => array($name, 'String'), - 2 => array($title, 'String'), - 3 => array((int) $self->_id, 'Integer'), - )); + 1 => array($name, 'String'), + 2 => array($title, 'String'), + 3 => array((int) $self->_id, 'Integer'), + )); if ($grpCnt) { $errors['title'] = ts('Custom group \'%1\' already exists in Database.', array(1 => $title)); } @@ -174,7 +173,6 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { * add the rules (mainly global rules) for form. * All local rules are added near the element * - * @param null * * @return void * @see valid_date @@ -186,7 +184,6 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { /** * Build the form object * - * @param null * * @return void */ @@ -202,18 +199,18 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { $contactTypes = array('Contact', 'Individual', 'Household', 'Organization'); $this->assign('contactTypes', json_encode($contactTypes)); - $sel1 = array("" => "- select -") + CRM_Core_SelectValues::customGroupExtends(); - $sel2 = array(); + $sel1 = array("" => ts("- select -")) + CRM_Core_SelectValues::customGroupExtends(); + $sel2 = array(); $activityType = CRM_Core_PseudoConstant::activityType(FALSE, TRUE, FALSE, 'label', TRUE); - $eventType = CRM_Core_OptionGroup::values('event_type'); - $grantType = CRM_Core_OptionGroup::values('grant_type'); - $campaignTypes = CRM_Campaign_PseudoConstant::campaignType(); - $membershipType = CRM_Member_BAO_MembershipType::getMembershipTypes(FALSE); + $eventType = CRM_Core_OptionGroup::values('event_type'); + $grantType = CRM_Core_OptionGroup::values('grant_type'); + $campaignTypes = CRM_Campaign_PseudoConstant::campaignType(); + $membershipType = CRM_Member_BAO_MembershipType::getMembershipTypes(FALSE); $participantRole = CRM_Core_OptionGroup::values('participant_role'); - $relTypeInd = CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, 'null', NULL, 'Individual'); - $relTypeOrg = CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, 'null', NULL, 'Organization'); - $relTypeHou = CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, 'null', NULL, 'Household'); + $relTypeInd = CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, 'null', NULL, 'Individual'); + $relTypeOrg = CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, 'null', NULL, 'Organization'); + $relTypeHou = CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, 'null', NULL, 'Household'); ksort($sel1); asort($activityType); @@ -257,11 +254,13 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { if ($main == 'Relationship') { $relName = self::getFormattedList($sel2[$main]); $sel2[$main] = array( - '' => ts("- Any -")) + $relName; + '' => ts("- Any -"), + ) + $relName; } else { $sel2[$main] = array( - '' => ts("- Any -")) + $sel2[$main]; + '' => ts("- Any -"), + ) + $sel2[$main]; } } } @@ -274,7 +273,8 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { $contactSubTypes[$key] = $key; } $sel2['Contact'] = array( - "" => "-- Any --") + $contactSubTypes; + "" => ("- Any -"), + ) + $contactSubTypes; } else { if (!isset($this->_id)) { @@ -387,11 +387,11 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { ), ); if (!$this->_isGroupEmpty && !empty($this->_subtypes)) { - $buttons[0]['js'] = array('onclick' => "return warnDataLoss()"); + $buttons[0]['class'] = 'crm-warnDataLoss'; } $this->addButtons($buttons); - // views are implemented as frozen form + // TODO: Is this condition ever true? Can this code be removed? if ($this->_action & CRM_Core_Action::VIEW) { $this->freeze(); $this->addElement('button', 'done', ts('Done'), array('onclick' => "location.href='civicrm/admin/custom/group?reset=1&action=browse'")); @@ -402,9 +402,9 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { * Set default values for the form. Note that in edit/view mode * the default values are retrieved from the database * - * @param null * - * @return array array of default values + * @return array + * array of default values */ public function setDefaultValues() { $defaults = &$this->_defaults; @@ -453,7 +453,6 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { /** * Process the form * - * @param null * * @return void */ @@ -492,8 +491,8 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { $action = CRM_Core_Resources::singleton()->ajaxPopupsEnabled ? '' : '/add'; $url = CRM_Utils_System::url("civicrm/admin/custom/group/field$action", 'reset=1&new=1&gid=' . $group->id . '&action=' . ($action ? 'add' : 'browse')); CRM_Core_Session::setStatus(ts("Your custom field set '%1' has been added. You can add custom fields now.", - array(1 => $group->title) - ), ts('Saved'), 'success'); + array(1 => $group->title) + ), ts('Saved'), 'success'); $session = CRM_Core_Session::singleton(); $session->replaceUserContext($url); } @@ -504,7 +503,7 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { if (is_array($db_prefix) && $config->userSystem->is_drupal && module_exists('views')) { // get table_name for each custom group $tables = array(); - $sql = "SELECT table_name FROM civicrm_custom_group WHERE is_active = 1"; + $sql = "SELECT table_name FROM civicrm_custom_group WHERE is_active = 1"; $result = CRM_Core_DAO::executeQuery($sql); while ($result->fetch()) { $tables[$result->table_name] = $result->table_name; @@ -515,8 +514,8 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { if (!empty($missingTableNames)) { CRM_Core_Session::setStatus(ts("To ensure that all of your custom data groups are available to Views, you may need to add the following key(s) to the db_prefix array in your settings.php file: '%1'.", - array(1 => implode(', ', $missingTableNames)) - ), ts('Note'), 'info'); + array(1 => implode(', ', $missingTableNames)) + ), ts('Note'), 'info'); } } } @@ -527,7 +526,8 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { * @param array $list * Array of relationship name. * - * @return array of relationship name. + * @return array + * Array of relationship name. */ public static function getFormattedList(&$list) { $relName = array(); @@ -552,4 +552,5 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { } return $relName; } + }