Commit e57b09da authored by Marco Villegas's avatar Marco Villegas
Browse files

Issue #443000 follow-up: Support pushing the same commit to other branch on... 

Issue #443000 follow-up: Support pushing the same commit to other branch on git_issue_mapper plugin.
parent 658556c7

versioncontrol_project_issue/versioncontrol_project_issue_git/plugins/event_processor/VersioncontrolEventProcessorGitIssueMapper.inc

+6 −1
Changes for versioncontrol_project_issue/versioncontrol_project_issue_git/plugins/event_processor/VersioncontrolEventProcessorGitIssueMapper.inc: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -62,7 +62,11 @@ class VersioncontrolEventProcessorGitIssueMapper implements VersioncontrolSynchr 
            continue;

          }

          $valid_issue_nids = $this->checkValidIssues($nids_on_message);

          // Make sure data is not already there, i.e same commits on a new

          // branch.

          $existing_maps = versioncontrol_project_issue_get_issue_operation_ids($valid_issue_nids);

          foreach ($valid_issue_nids as $valid_issue_nid) {

            if (!in_array($operation->vc_op_id, $existing_maps[$valid_issue_nid])) {

              $operation_nid_maps[] = array(

                'nid' => $valid_issue_nid,

                'vc_op_id' => $operation->vc_op_id
@@ -71,11 +75,12 @@ class VersioncontrolEventProcessorGitIssueMapper implements VersioncontrolSynchr 
          }

        }

      }

    }

    if (empty($operation_nid_maps)) {

      // Nothing to do.

      return;

    }

    // Insert mappings.

    // Insert mappings. Cannot use db_merge since it does not accept multiple rows.

    $insert_query = db_insert('versioncontrol_project_issue_operations')->fields(array('nid', 'vc_op_id'));

    foreach ($operation_nid_maps as $operation_nid_map) {

      $insert_query->values($operation_nid_map);