9f6ae0249c26a915834bfb67c9e88dc86bcaaa4f angie Fri Jun 7 07:15:33 2013 -0700 Avoid warnBox at the end of cfgTypeFromTdb for pgSnp tracks with views. Thanks Tim! refs #10977 #683 diff --git src/hg/lib/trackDbCustom.c src/hg/lib/trackDbCustom.c index b69159a..3475e43 100644 --- src/hg/lib/trackDbCustom.c +++ src/hg/lib/trackDbCustom.c @@ -685,31 +685,32 @@ } else if(startsWith("chain",type)) cType = cfgChain; else if (startsWith("bamWig", type)) cType = cfgWig; else if (startsWith("bam", type)) cType = cfgBam; else if (startsWith("psl", type)) cType = cfgPsl; else if (sameWord("vcfTabix",type)) cType = cfgVcf; // TODO: Only these are configurable so far if (cType == cfgNone && warnIfNecessary) { - if (!startsWith("bed ", type) && !startsWith("bedDetail", type) && !startsWith("bigBed", type) && !startsWith("gvf", type) + if (!startsWith("bed ", type) && !startsWith("bedDetail", type) && !startsWith("bigBed", type) + && !startsWith("gvf", type) && !sameString("pgSnp", type) && subgroupFind(tdb, "view", NULL)) warn("Track type \"%s\" is not yet supported in multi-view composites for %s.",type,tdb->track); } return cType; } int configurableByAjax(struct trackDb *tdb, eCfgType cfgTypeIfKnown) // Is this track configurable by right-click popup, or in hgTrackUi subCfg? // returns 0 = no; <0=explicitly blocked; >0=allowed and will be cfgType if determined { if (tdbIsMultiTrackSubtrack(tdb)) return cfgNone; // multitrack subtracks are never allowed to be separately configured. int ctPopup = (int)cfgTypeIfKnown; if (ctPopup <= cfgNone) ctPopup = (int)cfgTypeFromTdb(tdb,FALSE);