opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6056 from jmchilton/rule_Builder_fixes_2

Browse Source 
[18.05] Yet more rule builder fixes.
This commit is contained in:
Martin Cech
2018-05-04 11:44:12 -04:00
committed by GitHub
parent 1b41cbba59 3b5d8ae99c
commit 011e76a726
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/components/RuleCollectionBuilder.vue
+7 -4
View File
@@ -189,8 +189,8 @@
</rule-component>
<div v-if="displayRuleType == 'mapping'">
<div class="map"
v-for="map in mapping"
v-bind:index="map.index"
v-for="(map, index) in mapping"
v-bind:index="index"
v-bind:key="map.type">
<column-selector
:class="'rule-map-' + map.type.replace(/_/g, '-')"
@@ -202,7 +202,7 @@
:multiple="mappingTargets()[map.type].multiple"
:ordered="true"
:value-as-list="true">
<span v-b-tooltip.hover :title="titleRemoveMapping" class="fa fa-times" @click="removeMapping(map.index)"></span>
<span v-b-tooltip.hover :title="titleRemoveMapping" class="fa fa-times" @click="removeMapping(index)"></span>
</column-selector>
</div>
<div class="buttons rule-edit-buttons d-flex justify-content-end">
@@ -1490,7 +1490,10 @@ export default {
identifierColumnIndex < numIdentifierColumns;
identifierColumnIndex++
) {
let identifier = rowData[identifierColumns[identifierColumnIndex]];
// typeof indicates identifier is a string, but the raw string value coming from this data
// structure sometimes does not work as expected with indexOf below, I don't understand why
// but as a result this cast here seems needed.
let identifier = String(rowData[identifierColumns[identifierColumnIndex]]);
if (identifierColumnIndex + 1 == numIdentifierColumns) {
// At correct final position in nested structure for this dataset.
if (collectionTypeAtDepth === "paired") {