Merge pull request #2789 from compucorp/staging

Sync master with staging
compucorp · Jul 24, 2018 · 15943b5 · 15943b5
2 parents a6665f9 + 40b76c1
commit 15943b5
Show file tree

Hide file tree

Showing 330 changed files with 7,609 additions and 7,619 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -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.0 --url $WEBURL --admin-pass $ADMIN_PASS"
+          sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.3.1 --url $WEBURL --admin-pass $ADMIN_PASS"
 
           // Get target and PR branches name
           def prBranch = env.CHANGE_BRANCH

diff --git a/com.civicrm.hrjobroles/info.xml b/com.civicrm.hrjobroles/info.xml
@@ -8,8 +8,8 @@
     <author>Compucorp Ltd</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/com.civicrm.hrjobroles/js/karma.conf.js b/com.civicrm.hrjobroles/js/karma.conf.js
@@ -29,7 +29,7 @@ module.exports = function (config) {
       civihrPath + 'uk.co.compucorp.civicrm.hrcore/node_modules/karma-requirejs/lib/adapter.js',
 
       // all the common/ dependencies
-      civihrPath + 'org.civicrm.reqangular/dist/reqangular.min.js',
+      civihrPath + 'org.civicrm.reqangular/js/dist/reqangular.min.js',
 
       // the application modules
       { pattern: extPath + 'js/src/job-roles/**/*.js', included: false },

diff --git a/com.civicrm.hrjobroles/js/test/filters/get-active-values.filter.spec.js b/com.civicrm.hrjobroles/js/test/filters/get-active-values.filter.spec.js
@@ -3,7 +3,7 @@
 define([
   'common/angular',
   'common/angularMocks',
-  'job-roles/filters/get-active-values.filter'
+  'job-roles/modules/job-roles.filters'
 ], function (angular, moment) {
   'use strict';
 

diff --git a/com.civicrm.hrjobroles/templates/CRM/Hrjobroles/Import/Form/MapTable.tpl b/com.civicrm.hrjobroles/templates/CRM/Hrjobroles/Import/Form/MapTable.tpl
@@ -55,7 +55,7 @@
 
                 {section name=rows loop=$rowDisplayCount}
                     {assign var="j" value=$smarty.section.rows.index}
-                    <td class="{if $skipColumnHeader AND $smarty.section.rows.iteration == 1}even-row labels{else}odd-row{/if}">{$dataValues[$j][$i]}</td>
+                    <td class="{if $skipColumnHeader AND $smarty.section.rows.iteration == 1}even-row labels{else}odd-row{/if}">{$dataValues[$j][$i]|escape}</td>
                 {/section}
 
                 {* Display mapper <select> field for 'Map Fields', and mapper value for 'Preview' *}

diff --git a/contactaccessrights/info.xml b/contactaccessrights/info.xml
@@ -8,8 +8,8 @@
     <author>Compucorp Ltd</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/contactaccessrights/js/karma.conf.js b/contactaccessrights/js/karma.conf.js
@@ -29,10 +29,10 @@ module.exports = function (config) {
       civihrPath + 'uk.co.compucorp.civicrm.hrcore/node_modules/karma-requirejs/lib/adapter.js',
 
       // all the common/ dependencies
-      civihrPath + 'org.civicrm.reqangular/dist/reqangular.min.js',
+      civihrPath + 'org.civicrm.reqangular/js/dist/reqangular.min.js',
 
       // all the common/ mocked dependencies
-      civihrPath + 'org.civicrm.reqangular/dist/reqangular.mocks.min.js',
+      civihrPath + 'org.civicrm.reqangular/js/dist/reqangular.mocks.min.js',
 
       // the application modules
       {

diff --git a/contactsummary/info.xml b/contactsummary/info.xml
@@ -8,8 +8,8 @@
     <author>Compucorp Ltd</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/contactsummary/js/karma.conf.js b/contactsummary/js/karma.conf.js
@@ -29,7 +29,7 @@ module.exports = function (config) {
       civihrPath + 'uk.co.compucorp.civicrm.hrcore/node_modules/karma-requirejs/lib/adapter.js',
 
       // all the common/ dependencies
-      civihrPath + 'org.civicrm.reqangular/dist/reqangular.min.js',
+      civihrPath + 'org.civicrm.reqangular/js/dist/reqangular.min.js',
 
       // External extensions files
       { pattern: civihrPath + 'uk.co.compucorp.civicrm.hrleaveandabsences/js/src/**/!(*.spec).js', included: false },

diff --git a/hrbank/info.xml b/hrbank/info.xml
@@ -8,8 +8,8 @@
     <author>CiviCRM LLC</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/hrcareer/css/hrcareer.css b/hrcareer/css/hrcareer.css
diff --git a/hrcareer/hrcareer.php b/hrcareer/hrcareer.php
@@ -190,8 +190,5 @@ function hrcareer_civicrm_pageRun($page) {
 
     CRM_Core_Resources::singleton()
       ->addScriptFile('org.civicrm.hrcareer', 'js/hrcareer.js');
-
-    CRM_Core_Resources::singleton()
-      ->addStyleFile('org.civicrm.hrcareer', 'css/hrcareer.css');
   }
 }
diff --git a/hrcareer/info.xml b/hrcareer/info.xml
@@ -8,8 +8,8 @@
     <author>CiviCRM LLC</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/hrcase/info.xml b/hrcase/info.xml
@@ -8,8 +8,8 @@
     <author>CiviCRM LLC</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/hrdemog/info.xml b/hrdemog/info.xml
@@ -8,8 +8,8 @@
     <author>CiviCRM LLC</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/hrident/css/hrident.css b/hrident/css/hrident.css
diff --git a/hrident/hrident.php b/hrident/hrident.php
@@ -120,19 +120,6 @@ function hrident_civicrm_managed(&$entities) {
   return _hrident_civix_civicrm_managed($entities);
 }
 
-/**
- * Implementation of hook_civicrm_tabset.
- *
- * @param string $tabsetName
- * @param array &$tabs
- * @param array $context
- */
-function hrident_civicrm_tabset($tabsetName, &$tabs, $context) {
-  if ($tabsetName === 'civicrm/contact/view') {
-    CRM_Core_Resources::singleton()->addStyleFile('org.civicrm.hrident', 'css/hrident.css');
-  }
-}
-
 function hrident_getCustomGroupId() {
   $groups = CRM_Core_PseudoConstant::get('CRM_Core_BAO_CustomField', 'custom_group_id', array('labelColumn' => 'name'));
   return array_search('Identify', $groups);

diff --git a/hrim/info.xml b/hrim/info.xml
@@ -8,8 +8,8 @@
     <author>CiviCRM LLC</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/hrjobcontract/info.xml b/hrjobcontract/info.xml
@@ -8,8 +8,8 @@
     <author>Compucorp Ltd</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/hrjobcontract/js/karma.conf.js b/hrjobcontract/js/karma.conf.js
@@ -29,10 +29,10 @@ module.exports = function (config) {
       civihrPath + 'uk.co.compucorp.civicrm.hrcore/node_modules/karma-requirejs/lib/adapter.js',
 
       // all the common/ dependencies
-      civihrPath + 'org.civicrm.reqangular/dist/reqangular.min.js',
+      civihrPath + 'org.civicrm.reqangular/js/dist/reqangular.min.js',
 
       // all the common/ mocked dependencies
-      civihrPath + 'org.civicrm.reqangular/dist/reqangular.mocks.min.js',
+      civihrPath + 'org.civicrm.reqangular/js/dist/reqangular.mocks.min.js',
 
       // External extensions files
       { pattern: civihrPath + 'uk.co.compucorp.civicrm.hrleaveandabsences/js/src/**/!(*.spec).js', included: false },

diff --git a/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.tpl b/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.tpl
@@ -54,7 +54,7 @@
           <li>Contract ID : {$contract_id} => conflicting with the following Main contact contracts :</li>
           {foreach from=$conflicts item=contract}
             <ol>
-              <li> Title => <b>{$contract.title}</b> , ID => <b>{$contract.contract_id}</b></li>
+              <li> Title => <b>{$contract.title|escape}</b> , ID => <b>{$contract.contract_id}</b></li>
             </ol>
           {/foreach}
         {/foreach}
@@ -67,16 +67,16 @@
   </div>
 
   <div class="action-link">
-    {if $prev}<a href="{$prev}" class="crm-hover-button action-item"><i class="crm-i fa-chevron-left"></i> {ts}Previous{/ts}</a>{/if}
-    {if $next}<a href="{$next}" class="crm-hover-button action-item">{ts}Next{/ts} <i class="crm-i fa-chevron-right"></i></a>{/if}
-    <a href="{$flip}" class="action-item crm-hover-button">
+    {if $prev}<a href="{$prev|escape}" class="crm-hover-button action-item"><i class="crm-i fa-chevron-left"></i> {ts}Previous{/ts}</a>{/if}
+    {if $next}<a href="{$next|escape}" class="crm-hover-button action-item">{ts}Next{/ts} <i class="crm-i fa-chevron-right"></i></a>{/if}
+    <a href="{$flip|escape}" class="action-item crm-hover-button">
       <i class="crm-i fa-random"></i>
       {ts}Flip between original and duplicate contacts.{/ts}
     </a>
   </div>
 
   <div class="action-link">
-    <a href="#" class="action-item crm-hover-button crm-notDuplicate" title={ts}Mark this pair as not a duplicate.{/ts} onClick="processDupes( {$main_cid}, {$other_cid}, 'dupe-nondupe', 'merge-contact', '{$browseUrl}' );return false;">
+    <a href="#" class="action-item crm-hover-button crm-notDuplicate" title={ts}Mark this pair as not a duplicate.{/ts} onClick="processDupes( {$main_cid|escape}, {$other_cid|escape}, 'dupe-nondupe', 'merge-contact', '{$browseUrl}' );return false;">
       <i class="crm-i fa-times-circle"></i>
       {ts}Mark this pair as not a duplicate.{/ts}
     </a>
@@ -92,9 +92,9 @@
   <table class="row-highlight">
     <tr class="columnheader">
       <th>&nbsp;</th>
-      <th><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$other_cid"}">{$other_name}</a> ({ts}duplicate{/ts})</th>
+      <th><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$other_cid"}">{$other_name|escape}</a> ({ts}duplicate{/ts})</th>
       <th>{ts}Mark All{/ts}<br />=={$form.toggleSelect.html} ==&gt;</th>
-      <th><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$main_cid"}">{$main_name}</a></th>
+      <th><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$main_cid"}">{$main_name|escape}</a></th>
       <th width="300">Add/overwrite?</th>
     </tr>
 
@@ -115,7 +115,7 @@
       {if !isset($row.main) && !isset($row.other)}
         <tr style="background-color: #fff !important; border-bottom:1px solid #ccc !important;" class="no-data">
           <td>
-            <strong>{$row.title}</strong>
+            <strong>{$row.title|escape}</strong>
           </td>
       {else}
         {if $row.main eq $row.other}
@@ -124,7 +124,7 @@
            <tr class="crm-row-error {cycle values="odd-row,even-row"}">
         {/if}
           <td>
-            {$row.title}
+            {$row.title|escape}
           </td>
         {/if}
 
@@ -141,9 +141,9 @@
               <span>
             {/if}
             {if !is_array($row.other)}
-              {$row.other}
+              {$row.other|escape}
             {elseif $row.other.fileName}
-              {$row.other.fileName}
+              {$row.other.fileName|escape}
             {else}
               {', '|implode:$row.other}
             {/if}
@@ -165,15 +165,15 @@
               {strip}
                 {if $row.title|substr:0:5 == "Email"   OR
                     $row.title|substr:0:7 == "Address"}
-                  <span style="white-space: pre" id="main_{$blockName}_{$blockId}">
+                  <span style="white-space: pre" id="main_{$blockName|escape}_{$blockId|escape}">
                 {else}
-                  <span id="main_{$blockName}_{$blockId}">
+                  <span id="main_{$blockName|escape}_{$blockId|escape}">
                 {/if}
                 {* @TODO check if this is ever an array or a fileName? *}
                 {if !is_array($row.main)}
-                  {$row.main}
+                  {$row.main|escape}
                 {elseif $row.main.fileName}
-                  {$row.main.fileName}
+                  {$row.main.fileName|escape}
                 {else}
                   {', '|implode:$row.main}
                 {/if}
@@ -224,9 +224,9 @@
             <td>
               <span>
                 {if !is_array($row.main)}
-                  {$row.main}
+                  {$row.main|escape}
                 {elseif $row.main.fileName}
-                  {$row.main.fileName}
+                  {$row.main.fileName|escape}
                 {else}
                   {', '|implode:$row.main}
                 {/if}
@@ -331,7 +331,7 @@
     }
 
     // Update operation description
-    var operation_description = "{/literal}{ts}add{/ts}{literal}";
+    var operation_description = "{/literal}{ts escape='js'}add{/ts}{literal}";
     var add_new_check_length = this_controls.find(".location_operation_checkbox input:checked").length;
     if (mainBlock != false) {
       if (add_new_check_length > 0) {

diff --git a/hrjobcontract/templates/CRM/Hrjobcontract/Import/Form/MapTable.tpl b/hrjobcontract/templates/CRM/Hrjobcontract/Import/Form/MapTable.tpl
@@ -52,7 +52,7 @@
       <tr style="border-bottom: 1px solid #92B6EC;">
         {section name=rows loop=$rowDisplayCount}
           {assign var="j" value=$smarty.section.rows.index}
-          <td class="{if $skipColumnHeader AND $smarty.section.rows.iteration == 1}even-row labels{else}odd-row{/if}">{$dataValues[$j][$i]}</td>
+          <td class="{if $skipColumnHeader AND $smarty.section.rows.iteration == 1}even-row labels{else}odd-row{/if}">{$dataValues[$j][$i]|escape}</td>
         {/section}
 
         {* Display mapper <select> field for 'Map Fields', and mapper value for 'Preview' *}

diff --git a/hrmed/css/hrmed.css b/hrmed/css/hrmed.css
diff --git a/hrmed/hrmed.php b/hrmed/hrmed.php
@@ -164,7 +164,5 @@ function hrmed_civicrm_pageRun($page) {
       ->addScriptFile('civicrm', 'js/jquery/jquery.crmRevisionLink.js', CRM_Core_Resources::DEFAULT_WEIGHT, 'html-header');
     CRM_Core_Resources::singleton()
       ->addScriptFile('org.civicrm.hrmed', 'js/hrmed.js');
-    CRM_Core_Resources::singleton()
-      ->addStyleFile('org.civicrm.hrmed', 'css/hrmed.css');
   }
 }
diff --git a/hrmed/info.xml b/hrmed/info.xml
@@ -8,8 +8,8 @@
     <author>CiviCRM LLC</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/hrprofile/info.xml b/hrprofile/info.xml
@@ -8,8 +8,8 @@
     <author>CiviCRM LLC</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/hrqual/css/hrqual.css b/hrqual/css/hrqual.css
diff --git a/hrqual/hrqual.php b/hrqual/hrqual.php
@@ -173,7 +173,6 @@ function hrqual_civicrm_managed(&$entities) {
  */
 function hrqual_civicrm_tabset($tabsetName, &$tabs, $context) {
   if ($tabsetName === 'civicrm/contact/view') {
-    CRM_Core_Resources::singleton()->addStyleFile('org.civicrm.hrqual', 'css/hrqual.css');
     CRM_Core_Resources::singleton()->addScriptFile('org.civicrm.hrqual', 'js/hrqual.js');
 
     $optionGroups = CRM_Core_OptionGroup::values('category_of_skill_20130510015438');

diff --git a/hrqual/info.xml b/hrqual/info.xml
@@ -8,8 +8,8 @@
     <author>CiviCRM LLC</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/hrrecruitment/info.xml b/hrrecruitment/info.xml
@@ -8,8 +8,8 @@
     <author>CiviCRM LLC</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2018-07-17</releaseDate>
-  <version>1.7.8</version>
+  <releaseDate>2018-07-24</releaseDate>
+  <version>1.7.9</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>