Changeset 20775

Timestamp:

03/03/10 11:30:36 (2 years ago)

Author:

julie

Message:

fix comma-adding. check appropriate radio button as the radio buttons will be hidden if only one mine has orthologues

Location:

trunk

Files:

• bio/webapp/src/org/intermine/bio/web/logic/OrthologueConverter.java (modified) (1 diff)
• intermine/webapp/main/resources/webapp/js/imdwr.js (modified) (4 diffs)

trunk/bio/webapp/src/org/intermine/bio/web/logic/OrthologueConverter.java

@@ -88 +88 @@
             List<ResultElement> row = it.next();
             String orthologue = row.get(0).getField().toString();
-            if (orthologues != null) {
+            if (orthologues.length() > 0) {
                 orthologues.append(",");
             }
             orthologues.append(orthologue);
-        }
-        if (orthologues == null) {
-            return null;
         }
         return orthologues.toString();

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

@@ -803 +803 @@
     // convert orthologues then post
     if (myForm.orthologueMapping[1].checked) {
+         alert("converting!");
         // convert orthologues
         AjaxServices.convertObjects(bagType, bagName, 'orthologue', selectedOrganism, function(identifiers) {
+            alert("converted!");
             if (identifiers != null && identifiers != '') {
                 myForm.externalids.value = identifiers;
+                alert(myForm.externalids.value);
                 myForm.orthologue.disabled = true;
                 myForm.submit();
@@ -828 +831 @@
     var selectedOrganism = orthologueSelect.options[orthologueSelect.selectedIndex].text;
     myForm.orthologue.value = selectedOrganism;
+    var selectLocal = false;
 
     // hide/show the radio button and name of intermine if they do/don't have orthologues
@@ -840 +844 @@
             display('orthologueMappingRemoteRadio' + statusCount, false);
             display('orthologueMappingLocalRadio' + statusCount, false);
+            // check hidden radio button so that `local` mine is selected
+            // radio button is hidden but script needs this value to be checked
+            myForm.orthologueMapping[0].checked = false;
+            myForm.orthologueMapping[1].checked = true;
         }
     } else {
@@ -847 +855 @@
         display('orthologueMappingRemoteRadio' + statusCount, false);
         display('orthologueMappingLocalRadio' + statusCount, false);
-    }
+        //check hidden radio button so that `remote` mine is selected
+        // radio button is hidden but script needs this value to be checked
+        myForm.orthologueMapping[0].checked = true;
+        myForm.orthologueMapping[1].checked = false;
+    }
+
     // if there is only one option, don't show a dropdown
 //    if (orthologueSelect.length == 1) {