38b4967d14b1b13b6f636f321932dd6a18fdbf76 tdreszer Mon Oct 29 14:03:51 2012 -0700 Fixing supertrack children's support for 'parent' setting. With this, superfluous code was removed. Galt has reviewed this code already. diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index 1426c6f..fd6954e 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -3132,41 +3132,30 @@ else if (isHubTrack(track)) { tdb = hubConnectAddHubForTrackAndFindTdb(database, track, &tdbList, trackHash); } else if (sameString(track, "hgPcrResult")) tdb = pcrResultFakeTdb(); else { tdb = tdbForTrack(database, track,&tdbList); } if (tdb == NULL) { errAbort("Can't find %s in track database %s chromosome %s", track, database, chromosome); } -char *super = trackDbGetSupertrackName(tdb); -if (super) - { - /* configured as a supertrack member in trackDb */ - if (tdb->parent && sameString(super,tdb->parent->track)) - { // check trackName because super is returned for any level child - /* the supertrack is also configured, so use supertrack defaults */ - tdbMarkAsSuperTrack(tdb->parent); - trackDbSuperMemberSettings(tdb); - } - } char *title = (tdbIsSuper(tdb) ? "Super-track Settings" : tdbIsDownloadsOnly(tdb) ? DOWNLOADS_ONLY_TITLE : "Track Settings"); if(cartOptionalString(cart, "ajax")) { // html is going to be used w/n a dialog in hgTracks.js so serve up stripped down html trackUi(tdb, tdbList, ct, TRUE); cartRemove(cart,"ajax"); } else { cartWebStart(cart, database, "%s %s", tdb->shortLabel, title); trackUi(tdb, tdbList, ct, FALSE); printf("<BR>\n"); jsonPrintGlobals(TRUE); webEnd();