Changeset 20737

Timestamp:

26/02/10 13:11:29 (2 years ago)

Author:

julie

Message:

use correct default values

Location:

trunk

Files:

• bio/webapp/resources/webapp/model/orthologueLinkDisplayer.jsp (modified) (3 diffs)
• intermine/webapp/main/resources/webapp/js/imdwr.js (modified) (2 diffs)

trunk/bio/webapp/resources/webapp/model/orthologueLinkDisplayer.jsp

@@ -17 +17 @@
     <td align="right">
         <c:if test="${!empty imageName}">
-         <a href="#orthologue_link_${status.count}" title="${mineName}" class="boxy" >
+         <a href="#orthologue_link_${status.count}" onclick="checkOrthologueMapping('${status.count}', '${mineName}', '${WEB_PROPERTIES['project.title']}');" title="${mineName}" class="boxy" >
                <html:img src="model/images/${imageName}" title="${mineName}"/>
          </a>
@@ -23 +23 @@
     </td>
     <td>
-        <a href="#orthologue_link_${status.count}" title="${mineName}" class="boxy" >
+        <a href="#orthologue_link_${status.count}" onclick="checkOrthologueMapping('${status.count}', '${mineName}', '${WEB_PROPERTIES['project.title']}');" title="${mineName}" class="boxy" >
             ${mineName}&nbsp;<img src="images/ext_link.png" title="${mineName}"/>
         </a>
@@ -36 +36 @@
             <td valign="top"><b>Orthologues</b></td>
             <td valign="top">
-            <select name="orthologueDatasets" onchange="checkOrthologueMapping('${status.count}', this.options[this.selectedIndex].value, '${mineName}', '${WEB_PROPERTIES['project.title']}');">
+            <select name="orthologueDatasets" onchange="checkOrthologueMapping('${status.count}', '${mineName}', '${WEB_PROPERTIES['project.title']}');">
             <c:forEach var="entry" items="${orthologuesToDatasets}" varStatus="entryStatus">
                 <c:set var="orthologue" value="${entry.key}"/>

trunk/intermine/webapp/main/resources/webapp/js/imdwr.js

@@ -790 +790 @@
     var orthologueSelect = myForm.orthologueDatasets;
     var selectedOrganism = orthologueSelect.options[orthologueSelect.selectedIndex].text;
-    
+
     // use remote mapping, just post the original list
     if (myForm.orthologueMapping[0].checked) {
@@ -818 +818 @@
 }
 
-function checkOrthologueMapping(statusCount, datasets, remoteMine, localMine) {
+function checkOrthologueMapping(statusCount, remoteMine, localMine) {
+    var myForm = document.forms['orthologueLinkForm' + statusCount];
+    var orthologueSelect = myForm.orthologueDatasets;
+    var datasets = orthologueSelect.options[orthologueSelect.selectedIndex].value;
     var bits = datasets.split("|");
     var localMapping = bits[0];
     var remoteMapping = bits[1];
-    var myForm = document.forms['orthologueLinkForm' + statusCount];
-    var orthologueSelect = myForm.orthologueDatasets;
-
     var selectedOrganism = orthologueSelect.options[orthologueSelect.selectedIndex].text;
     myForm.orthologue.value = selectedOrganism;