f33bc4bb50a4d5a8cb85729f51990c7da83613ff braney Fri Feb 16 17:25:19 2018 -0800 when adding a custom track from hgTracks, change name to shortLabel, and description to longLabel diff --git src/hg/hgCollection/hgCollection.c src/hg/hgCollection/hgCollection.c index e9511bf..19e4760 100644 --- src/hg/hgCollection/hgCollection.c +++ src/hg/hgCollection/hgCollection.c @@ -336,30 +336,31 @@ struct trackDb *tdb; jsInlineF("<ul>"); for(tdb = trackList; tdb; tdb = tdb->next) { if ( sameString(tdb->grp, curGroup->name)) { printGroup(curGroup->name, tdb, FALSE, FALSE); } } jsInlineF("</ul>"); jsInlineF("</li>"); jsInlineF("</ul>"); } jsInlineF("\");\n"); +jsReloadOnBackButton(cart); jsInlineF("hgCollection.init();\n"); } static void printHelp() // print out the help page { puts( "<br><a name='INFO_SECTION'></a>\n" " <div class='row gbsPage'>\n" " <div ><h1>Track Collection Builder Help</h1></div>\n" " <div >\n" ); puts( " </div>\n" " </div>\n" @@ -861,31 +862,36 @@ outTrackDbList(db, conn, f, hubName, tdb->subtracks, collectionName, newTdb, numTabs + 1); } } static void doAddTrack(struct cart *cart, char *db, struct trackDb *trackList, char *trackName, char *collectionName, struct hash *nameHash) /* Add a track to a collection in a hub. */ { char *fileName = getHubName(cart, db); char *hubName = hubNameFromUrl(fileName); FILE *f = fopen(fileName, "w"); struct trackDb *newTdb = hashMustFindVal(nameHash, trackHubSkipHubName(trackName)); hashReplace(newTdb->settingsHash, "track", makeUnique(nameHash, trackName)); hashReplace(newTdb->settingsHash, "parent", trackHubSkipHubName(collectionName)); char *tdbType = trackDbSetting(newTdb, "tdbType"); if (tdbType != NULL) + { hashReplace(newTdb->settingsHash, "type", tdbType); + hashReplace(newTdb->settingsHash, "shortLabel", trackDbSetting(newTdb, "name")); + hashReplace(newTdb->settingsHash, "longLabel", trackDbSetting(newTdb, "description")); + } + outHubHeader(f, db); struct sqlConnection *conn = hAllocConn(db); modifyName(newTdb, hubName, NULL); outTrackDbList(db, conn, f, hubName, trackList, collectionName, newTdb, 0); hFreeConn(&conn); fclose(f); } static void doMiddle(struct cart *cart) /* Set up globals and make web page */ { char *db; char *genome;