Changeset 7360


Ignore:
Timestamp:
May 10, 2017, 12:59:15 PM (5 years ago)
Author:
Nicklas Nordborg
Message:

Merge pre-BASE 3.11 changes to trunk.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/core/net/sf/basedb/core/PluginRequest.java

    r7329 r7360  
    8383    this.plugin = plugin;
    8484    this.command = command;
    85     this.state = job.loadState(plugin.getClass().getClassLoader());
     85    this.state = job == null ? null : job.loadState(plugin.getClass().getClassLoader());
    8686    this.pluginConfiguration = pluginConfiguration;
    8787    this.pluginDefinition = pluginDefinition;
  • trunk/www/common/plugin/test_with_file.js

    r6540 r7360  
    5353   
    5454    test.initParameters();
     55    test.autoParse();
    5556  }
    5657 
     
    9596    var response = JSON.parse(request.responseText);
    9697    var charset = response.characterSet;
     98    var frm = document.forms['testwithfile'];
    9799    if (charset)
    98100    {
    99       var frm = document.forms['testwithfile'];
    100101      Forms.selectListOption(frm.charset, charset);
     102    }
     103    test.autoParse();
     104  }
     105 
     106  // Parse the selected file if we have the required parameters
     107  test.autoParse = function()
     108  {
     109    var frm = document.forms['testwithfile'];
     110    if (Strings.trim(frm.path.value) != '' && Strings.trim(frm.dataSplitter.value) != '')
     111    {
     112      test.parseFile();
    101113    }
    102114  }
Note: See TracChangeset for help on using the changeset viewer.