src/hg/lib/hui.c 1.229
1.229 2009/08/14 21:15:49 tdreszer
Multi-view settings should not show up in the table browser 'merge' function.
Index: src/hg/lib/hui.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/hui.c,v
retrieving revision 1.228
retrieving revision 1.229
diff -b -B -U 4 -r1.228 -r1.229
--- src/hg/lib/hui.c 14 Aug 2009 20:52:04 -0000 1.228
+++ src/hg/lib/hui.c 14 Aug 2009 21:15:49 -0000 1.229
@@ -5334,27 +5334,30 @@
}
if (fakeSubmit)
cgiMakeHiddenVar(fakeSubmit, "submit");
-if(subgroupingExists(tdb,"view"))
+cartSaveSession(cart);
+cgiContinueHiddenVar("g");
+
+if(displayAll)
+ {
+ if(subgroupingExists(tdb,"view"))
{
hCompositeDisplayViewDropDowns(db, cart,tdb);
if(subgroupCount(tdb) <= 1)
viewsOnly = TRUE;
}
-if(!viewsOnly)
+ if(!viewsOnly)
{
if(trackDbSettingOn(tdb, "allButtonPair"))
hCompositeUiAllButtons(db, cart, tdb, formName);
else if (!hasSubgroups || !isMatrix || primarySubtrack)
hCompositeUiNoMatrix(db, cart,tdb,primarySubtrack,formName);
else
hCompositeUiByMatrix(db, cart, tdb, formName);
}
-cartSaveSession(cart);
-cgiContinueHiddenVar("g");
-if (displayAll)
compositeUiAllSubtracks(db, cart, tdb, primarySubtrack);
+ }
else
compositeUiSelectedSubtracks(db, cart, tdb, primarySubtrack);
cfgLinkToDependentCfgs(tdb,tdb->tableName);