Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PCHR-4473: Run tests on CiviCRM 5.12.0 #2983

Draft
wants to merge 40 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
96167e1
PCHR-3681: Remove unnecessary store param in calls to CRM_Utils_Reque…
davialexandre Aug 1, 2018
109b1a1
Merge pull request #2825 from compucorp/PCHR-3681-finish-migrating-sc…
davialexandre Sep 13, 2018
eaed1c2
Merge branch 'master' into PCHR-3680-drupal-profile
davialexandre Oct 5, 2018
0f5d576
Merge branch 'master' into PCHR-3680-drupal-profile
davialexandre Oct 10, 2018
90c2df0
PCHR-4346: Run tests on CiviCRM 5.7
davialexandre Oct 23, 2018
1e26062
PCHR-4346: Fix undefined index error when using the HRJobContract.get…
davialexandre Oct 23, 2018
6d079d3
PCHR-4346: Sync CRM_Hrjobcontract_Dedupe_Merger with Civi 5.7.0
davialexandre Oct 24, 2018
ebc2f44
PCHR-4346: Sync templates/CRM/Hrjobcontract/Form/Merge.tpl with Civi …
davialexandre Oct 24, 2018
2cea29a
PCHR-4346: Sync CRM_Core_BAO_Navigation.php with CiviCRM 5.7.0
davialexandre Oct 29, 2018
5d05e88
PCHR-4346: Sync overridden Summary.tpl file in hrui with CiviCRM 5.7.0
davialexandre Oct 30, 2018
8974e1c
PCHR-4346: Sync CRM_Export_BAO_Export in hrjobcontract with CiviCRM 5…
davialexandre Oct 24, 2018
0232ce4
PCHR-4346: Remove the overridden `Navigation.php` file
davialexandre Nov 1, 2018
d9b3684
Merge remote-tracking branch 'origin/PCHR-3680-drupal-profile' into m…
davialexandre Nov 9, 2018
8c62c60
Merge branch 'master' into master-php7
davialexandre Nov 21, 2018
4cd6923
Merge branch 'master' into master-php7
davialexandre Dec 6, 2018
53d06af
PCHR-4426: Make sure number_of_hours is always a float
davialexandre Dec 6, 2018
dd18202
Merge pull request #2965 from compucorp/PCHR-4426-fix-work-patterns-w…
davialexandre Dec 7, 2018
cbc28d4
Merge branch 'master' into master-php7
davialexandre Dec 7, 2018
dcdfa7c
Merge branch 'PCHR-4321-php7-upgrade' into master-php7
davialexandre Dec 7, 2018
62dbfc6
PCHR-4441: Fix warnings on the L&A settings page
davialexandre Dec 7, 2018
50e29a1
Merge pull request #2967 from compucorp/PCHR-4441-lna-settings-page-e…
davialexandre Dec 7, 2018
91c147b
Merge branch 'PCHR-4321-php7-upgrade' into master-php7
davialexandre Dec 7, 2018
88b0505
PCHR-4346: Change CiviCRM version to 5.7.0
davialexandre Dec 14, 2018
dea5146
Merge pull request #2899 from compucorp/PCHR-4346-civicrm-upgrade
davialexandre Dec 14, 2018
85b8287
PCHR-4446: Fix expected variable reference warning
tunbola Dec 14, 2018
925b490
Merge pull request #2973 from compucorp/PCHR-4446-fix-reference-warning
tunbola Dec 14, 2018
fb73df3
PCHR-4448: Fix error related no variable not implementing Countable I…
tunbola Dec 14, 2018
5fd26d2
PCHR-4448: Fix error related to Object not being able to convert to int/
tunbola Dec 14, 2018
63b9dec
PCHR-4446: Use class property for $_mapperLocType variable
tunbola Dec 14, 2018
886244f
Merge pull request #2974 from compucorp/PCHR-4448-fix-contract-import…
tunbola Dec 14, 2018
de9524b
Merge remote-tracking branch 'origin/PCHR-4321-php7-upgrade' into mas…
tunbola Dec 14, 2018
ef55c5c
PCHR-4473: Use Civi 5.9 in Jenkins
davialexandre Dec 19, 2018
9b04f98
PCHR-4473: Sync overridden core files with CiviCRM 5.9.0
davialexandre Dec 20, 2018
8cfed4e
PCHR-4473: Fix tabs icons on the contact summary page
davialexandre Dec 21, 2018
7b8f556
PCHR-4473: Remove unecessary HR tag from key dates and key details pa…
davialexandre Dec 21, 2018
d335cd3
PCHR-4473: Run tests on CiviCRM 5.12.0
davialexandre Apr 4, 2019
7bd7257
Merge remote-tracking branch 'origin/master-php7' into PCHR-4473-civi…
davialexandre Apr 5, 2019
f04027b
Merge remote-tracking branch 'origin/PCHR-4473-civicrm-5.9-upgrade' i…
davialexandre Apr 8, 2019
356f9f3
PCHR-4473: Sync overridden files with CiviCRM 5.12.0
davialexandre Apr 8, 2019
1472133
PCHR-4473: Fix custom icons of the contact summary page tabs
davialexandre Apr 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pipeline {
steps {
script {
// Build site with CV Buildkit
sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.3.1 --url $WEBURL --admin-pass $ADMIN_PASS"
sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.12.0 --url $WEBURL --admin-pass $ADMIN_PASS"

// Get target and PR branches name
def prBranch = env.CHANGE_BRANCH
Expand Down
1 change: 1 addition & 0 deletions com.civicrm.hrjobroles/hrjobroles.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ function hrjobroles_civicrm_tabset($tabsetName, &$tabs, $context) {
$tabs[] = array( 'id' => 'hrjobroles',
'url' => $url,
'title' => 'Job Roles',
'icon' => 'crm-i fa-list-alt',
'weight' => -180,
);
}
Expand Down
7 changes: 4 additions & 3 deletions contactsummary/contactsummary.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ function contactsummary_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
function contactsummary_civicrm_pageRun($page) {
if ($page instanceof CRM_Contact_Page_View_Summary) {
CRM_Core_Resources::singleton()
->addSetting(array(
'tabSettings' => array('active' => CRM_Utils_Request::retrieve('selectedChild', 'String', $this, FALSE, 'contactsummary')),
))
->addSetting([
'tabSettings' => ['active' => CRM_Utils_Request::retrieve('selectedChild', 'String') ?: 'contactsummary'],
])
->addVars('leaveAndAbsences', [
'baseURL' => CRM_Core_Resources::singleton()->getUrl('uk.co.compucorp.civicrm.hrleaveandabsences'),
'attachmentToken' => CRM_Core_Page_AJAX_Attachment::createToken()
Expand All @@ -157,6 +157,7 @@ function contactsummary_civicrm_tabset($tabsetName, &$tabs, $context) {
'id' => 'contactsummary',
'url' => CRM_Utils_System::url('civicrm/contact-summary'),
'title' => ts('Contact Summary'),
'icon' => 'crm-i fa-user',
'weight' => -200,
);
}
Expand Down
19 changes: 19 additions & 0 deletions hrbank/hrbank.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,22 @@ function hrbank_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
function hrbank_civicrm_managed(&$entities) {
return _hrbank_civix_civicrm_managed($entities);
}

/**
* Implementation of hook_civicrm_tabset
*
* @param string $tabsetName
* @param array $tabs
* @param mixed $context
*/
function hrbank_civicrm_tabset($tabsetName, &$tabs, $context) {
if ($tabsetName != 'civicrm/contact/view') {
return;
}

foreach ($tabs as $i => $tab) {
if ($tab['title'] == 'Bank Details') {
$tabs[$i]['icon'] = 'crm-i fa-bank';
}
}
}
23 changes: 21 additions & 2 deletions hrcareer/hrcareer.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function hrcareer_getUFGroupID() {
*/
function hrcareer_civicrm_buildProfile($name) {
if ($name == 'hrcareer_tab') {
$isDialog = ('multiProfileDialog' == CRM_Utils_Request::retrieve('context', 'String', CRM_Core_DAO::$_nullObject));
$isDialog = ('multiProfileDialog' == CRM_Utils_Request::retrieve('context', 'String'));

// To fix validation alert issue
$smarty = CRM_Core_Smarty::singleton();
Expand All @@ -167,7 +167,7 @@ function hrcareer_civicrm_buildProfile($name) {

$config = CRM_Core_Config::singleton();
if ($config->logging && ! $isDialog) {
$contactID = CRM_Utils_Request::retrieve('id', 'Positive', $this);
$contactID = CRM_Utils_Request::retrieve('id', 'Positive');
CRM_Core_Region::instance('profile-form-hrcareer_tab')->add(array(
'template' => 'CRM/common/logButton.tpl',
'instance_id' => CRM_Report_Utils_Report::getInstanceIDForValue('logging/contact/summary'),
Expand All @@ -192,3 +192,22 @@ function hrcareer_civicrm_pageRun($page) {
->addScriptFile('org.civicrm.hrcareer', 'js/dist/hrcareer.min.js', 1010);
}
}

/**
* Implementation of hook_civicrm_tabset
*
* @param string $tabsetName
* @param array $tabs
* @param mixed $context
*/
function hrcareer_civicrm_tabset($tabsetName, &$tabs, $context) {
if ($tabsetName != 'civicrm/contact/view') {
return;
}

foreach ($tabs as $i => $tab) {
if ($tab['title'] == 'Career History') {
$tabs[$i]['icon'] = 'crm-i fa-history';
}
}
}
4 changes: 2 additions & 2 deletions hrident/hrident.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ function hrident_civicrm_buildProfile($name) {
$smarty->assign('urlIsPublic', FALSE);

$config = CRM_Core_Config::singleton();
if ($config->logging && 'multiProfileDialog' !== CRM_Utils_Request::retrieve('context', 'String', CRM_Core_DAO::$_nullObject)) {
$contactID = CRM_Utils_Request::retrieve('id', 'Positive', $this);
if ($config->logging && 'multiProfileDialog' !== CRM_Utils_Request::retrieve('context', 'String')) {
$contactID = CRM_Utils_Request::retrieve('id', 'Positive');
CRM_Core_Region::instance('profile-form-hrident_tab')->add(array(
'template' => 'CRM/common/logButton.tpl',
'instance_id' => CRM_Report_Utils_Report::getInstanceIDForValue('logging/contact/summary'),
Expand Down
Loading