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

[WIP] PCHR-4473: Use Civi 5.9 in Jenkins #2978

Open
wants to merge 4 commits into
base: PCHR-4321-php7-upgrade
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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.7.0 --url $WEBURL --admin-pass $ADMIN_PASS"
sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.9 --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' => 'fa fa-list-alt',
'weight' => -180,
);
}
Expand Down
1 change: 1 addition & 0 deletions contactsummary/contactsummary.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' => 'fa fa-user',
'weight' => -200,
);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<section class="panel panel-default panel-default-plain-inverted panel--key-dates" ng-controller="KeyDatesController as KeyDates">
<section class="panel panel-default panel-default-plain panel-inverted panel--key-dates" ng-controller="KeyDatesController as KeyDates">
<header class="panel-heading">
<h2 class="panel-title">Key Dates</h2>
<hr>
</header>
<div class="panel-body">
<div class="panel-body-section">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<section class="panel panel-default panel-default-plain panel--key-details"
<section class="panel panel-default panel--key-details"
ng-controller="KeyDetailsController as KeyDetails">
<header class="panel-heading">
<h2 class="panel-title">Key Details</h2>
<hr>
</header>
<div class="panel-body">
<dl class="dl-horizontal">
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'] = 'fa fa-bank';
}
}
}
19 changes: 19 additions & 0 deletions hrcareer/hrcareer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'] = 'fa fa-history';
}
}
}
Loading