90575b28d8d97732503671e4c5c80f7fbf2d3ac2
tdreszer
  Tue Oct 11 13:57:16 2011 -0700
With subCfg, when only one subtrack, highlevel shouuld show subtrack controls, so that rightClick and subCfg work together.
diff --git src/hg/hgTracks/imageV2.c src/hg/hgTracks/imageV2.c
index 8723fdd..7194dbd 100644
--- src/hg/hgTracks/imageV2.c
+++ src/hg/hgTracks/imageV2.c
@@ -281,36 +281,36 @@
     struct trackDb *parentTdb = (kindOfChild == kocFolderContent ? track->tdb->parent :tdbGetContainer(track->tdb));
 
     jsonHashAddString(ele, "parentTrack", parentTdb->track);
     jsonHashAddString(ele, "parentLabel", parentTdb->shortLabel);
     if (kindOfChild != kocFolderContent && !track->canPack)
         {
         jsonHashAddNumber(ele, "shouldPack", 0); // default vis is full, but pack is an option
         track->canPack = parentTdb->canPack;
         }
     }
 
 // XXXX really s/d be numChildren
 jsonHashAddNumber(ele, "hasChildren", slCount(track->tdb->subtracks));
 
 // Configuring?
-int cfgByPopup = configurableByPopup(track->tdb,0);
+int cfgByPopup = configurableByAjax(track->tdb,0);
 if (!configurable
 ||  track->hasUi == FALSE
-||  (cfgByPopup == 0 && tdbIsCompositeSubtrack(track->tdb)))
+||  cfgByPopup == cfgNone)
     jsonHashAddString(ele, "configureBy", "none");
-else if (cfgByPopup < 0)
+else if (cfgByPopup < 0)  // denied via ajax, but allowed via full normal hgTrackUi page
     jsonHashAddString(ele, "configureBy", "clickThrough");
 else
     jsonHashAddString(ele, "configureBy", "popup");
 
 // Remote access by URL?
 if (sameWord(track->tdb->type, "remote") && trackDbSetting(track->tdb, "url") != NULL)
     jsonHashAddString(ele, "url", trackDbSetting(track->tdb, "url"));
 
 // Close with some standard vars
 jsonHashAddString(ele, "shortLabel", track->shortLabel);
 jsonHashAddString(ele, "longLabel", track->longLabel);
 jsonHashAddNumber(ele, "canPack", track->canPack);
 
 if(track->limitedVis != track->visibility)
     jsonHashAddNumber(ele, "limitedVis", track->limitedVis);