4d2eb49f84199890ac7e679ba67f094cb49bd124
braney
  Thu Apr 6 14:29:02 2023 -0700
Change recommended track sets to merge with the current session.  refs #28525

diff --git src/hg/hgTracks/recTrackSets.c src/hg/hgTracks/recTrackSets.c
index a786488..d09316e 100644
--- src/hg/hgTracks/recTrackSets.c
+++ src/hg/hgTracks/recTrackSets.c
@@ -129,45 +129,35 @@
 if (recTrackSetsChangeDetectEnabled())
     jsInline("var recTrackSetsDetectChanges = true;");
 
 hPrintf("<div style='display:none;' id='recTrackSetsPopup' title='Recommended Track Sets'>\n");
 
 // TODO: Consider moving this to the tab file as a header section
 hPrintf("<p>These links provide track sets selected and pre-configured for "
             "specific user scenarios. They are designed to be useful at "
             "different genomic loci. Clicking a link below will create a browser "
             "window with these tracks visible, without changing the locus.</p>");
 
 hPrintf("<ul class='indent'>");
 for (recTrackSet = recTrackSets; recTrackSet != NULL; recTrackSet = recTrackSet->next)
     {
 // TODO: consider libifying hgSession.c:add/getSessionLink() and using that
-    boolean mergeSession = cfgOptionBooleanDefault("mergeRecommended", FALSE);
-    char *mergeSessionString = "";
-    if (mergeSession)
-        mergeSessionString = "&" hgsMergeCart "=on";
 
+#define rtsLoadSessionName  "rtsLoad"
     hPrintf("<li><a class='recTrackSetLink' href='./hgTracks?"
-                    // preserve these user settings 
-                    "pix=%d&textSize=%s&textFont=%s&hgt.labelWidth=%d"
-                    "&" hgsOtherUserName "=%s"
-                    "&" hgsOtherUserSessionName "=%s"
-                    "&" hgsOtherUserSessionLabel "=%s"
-                    "&hgS_otherUserSessionDesc=%s"
-                    "&" hgsDoOtherUser "=submit"
-                    "%s"
+                    hgsOtherUserName "=%s"
+                    "&" rtsLoadSessionName "=%s"
+                    "& hgsid=%s"
                     "&position="        // JS fills in position
                     "'>" 
                 "%s</a>: <small>%s</small></li>",
-                    tl.picWidth, tl.textSize, tl.textFont, tl.leftLabelWidthChars,
-                    recTrackSet->userName, recTrackSet->sessionName, 
-                    recTrackSet->label, recTrackSet->description,  mergeSessionString,
+                    recTrackSet->userName, recTrackSet->sessionName, cartSessionId(cart),
                     recTrackSet->label, recTrackSet->description);
     }
 hPrintf("</ul>");
 
 hPrintf("<p>Return to <a href='./hgTracks?hgt.reset=on'>Default</a> browser tracks.</p>\n");
 hPrintf("<p><small><em>This tool is for research use only. For personal medical or "
                 "genetic advising, consult a qualified physician.</small></em></p>\n");
 hPrintf("</div>\n");
 }