Changeset 1499


Ignore:
Timestamp:
Jan 12, 2012, 2:14:38 PM (10 years ago)
Author:
Martin Svensson
Message:

Merged 2.0-stable branch into trunk

Location:
extensions/net.sf.basedb.reggie/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk

  • extensions/net.sf.basedb.reggie/trunk/resources/specimentube.jsp

    r1497 r1499  
    2727  BioPlate recentBox = null;
    2828  String recentBoxName = ""; 
     29  int recentBoxId = 0;
    2930  if (recentBoxes.size() > 0)
    3031  {
     
    4445          nameString = "0"+nameString;
    4546        }
    46         recentBoxName = "Sp"+nameString;       
     47        recentBoxName = "Sp"+nameString;
    4748      }     
    4849    }
     
    5051    {
    5152      recentBoxName = recentBox.getName();
     53      recentBoxId = recentBox.getId();
    5254    }
    5355  }
     
    209211    var allPrepWeightValue = '';
    210212
    211     boxInfo[i] = null;
     213    boxInfo[i] = <%=recentBoxId == 0 ? "null" : recentBoxId %>;
    212214    var boxDisabled = '';
    213215   
     
    445447    setInputStatus('rowColumn'+tubeIndex, 'Row or column cannot be empty when the box is specified.', 'invalid');
    446448    return false;
    447   }
     449  }
     450 
     451  if (boxInfo[tubeIndex] == null)
     452  {
     453    boxOnChange(tubeIndex);
     454    if (boxInfo[tubeIndex] == null) return;
     455  }
    448456 
    449457  var request = Ajax.getXmlHttpRequest();
     
    525533    if (response.boxInfo)
    526534    {
     535      boxInfo[tubeIndex] = response.boxInfo;
    527536      if (response.freeRow && response.freeColumn)
    528537      {
Note: See TracChangeset for help on using the changeset viewer.