37a4b2bd13df4cd799faedbed9edf0297439970e
tdreszer
Wed Feb 8 15:17:58 2012 -0800
Ouch. Fixed problem created by uncareful use of {} brackets. Fallout from redmine 6622 checkin.
diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c
index f780ed5..3bc97c1 100644
--- src/hg/hgTrackUi/hgTrackUi.c
+++ src/hg/hgTrackUi/hgTrackUi.c
@@ -2781,43 +2781,42 @@
superTrackDropDown(cart, tdb, 1);
}
else
{
/* normal visibility control dropdown */
enum trackVisibility vis = tdb->visibility;
boolean canPack = rTdbTreeCanPack(tdb);
if (ajax)
{
vis = tdbVisLimitedByAncestry(cart, tdb, TRUE); // ajax popups should show currently inherited visability
// composite children may inherit squish/pack vis so allow it.
if (canPack == FALSE && tdbIsCompositeChild(tdb))
canPack = rTdbTreeCanPack(tdbGetComposite(tdb));
}
else
- {
vis = hTvFromString(cartUsualString(cart,tdb->track, hStringFromTv(vis))); // But hgTrackUi page should show local vis
+
if (tdbIsSuperTrackChild(tdb))
{
hTvDropDownClassVisOnlyAndExtra(tdb->track,vis,canPack,
"normalText superChild visDD", trackDbSetting(tdb, "onlyVisibility"),
"onchange='visTriggersHiddenSelect(this);'");
}
else
hTvDropDownClassVisOnlyAndExtra(tdb->track,vis,canPack,
"normalText visDD", trackDbSetting(tdb, "onlyVisibility"),NULL);
}
- }
if (!ajax)
{
printf(" ");
cgiMakeButton("Submit", "Submit");
#ifdef SUBTRACK_CFG
// Offer cancel button always? // composites and multiTracks (not standAlones or supers)
if (tdbIsContainer(tdb))
{
printf(" ");
cgiMakeOnClickButton("window.history.back();","Cancel");
}
#endif///def SUBTRACK_CFG
if(tdbIsComposite(tdb))
printf("\n <a href='#' onclick='setVarAndPostForm(\"%s\",\"1\",\"mainForm\"); return false;'>Reset to defaults</a>\n",setting);