6f4f117363c1cbd67ce43df4149f2fc9881f87b2 tdreszer Wed Jun 22 09:46:25 2011 -0700 Fix for redmine 4381: subtrack cfg open shouldn't also open metadata. diff --git src/hg/js/hui.js src/hg/js/hui.js index 9a0859b..0b28244 100644 --- src/hg/js/hui.js +++ src/hg/js/hui.js @@ -715,32 +715,34 @@ cache: false }); } function popUpSubtrackCfg(trackName,label) { waitOnFunction( _popUpSubrackCfg, trackName, label ); // Launches the popup but shields the ajax with a waitOnFunction return false; } function subtrackCfgShow(tableName) { // Will show subtrack specific configuration controls // Config controls not matching name will be hidden var divit = $("#div_"+tableName+"_cfg"); - if($(divit).css('display') == 'none') + if(($(divit).css('display') == 'none') + && metadataIsVisible(tableName)) metadataShowHide(tableName,"",""); + // Could have all inputs commented out, then uncommented when clicked: // But would need to: // 1) be able to find composite view level input // 2) know if subtrack input is non-default (if so then subtrack value overrides composite view level value) // 3) know whether so composite view level value has changed since hgTrackUi displayed (if so composite view level value overrides) $(divit).toggle(); return false; } function enableViewCfgLink(enable,view) { // Enables or disables a single configuration link. var link = $('#a_cfg_'+view); if(enable) $(link).attr('href','#'+$(link).attr('id'));