diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-03-10 12:19:45 +0100 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-03-10 12:19:45 +0100 |
| commit | ca4579ea4371dd99613a463849b0d180207f472b (patch) | |
| tree | 444fbef1493be61cd68e9c98deb217ce63790755 | |
| parent | a101b1ff1ba3be2ba64655127f67a17d2872fc7b (diff) | |
| parent | d1ad229730f6e6043fe6e7a150e05ffa41e3cec2 (diff) | |
Merge branch 'master' of github.com:opentox/toxcreate
Conflicts:
public/javascripts/toxcreate.js
| -rwxr-xr-x | public/javascripts/toxcreate.js | 12 | ||||
| -rw-r--r-- | views/model.haml | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/public/javascripts/toxcreate.js b/public/javascripts/toxcreate.js index 410778f..94d944d 100755 --- a/public/javascripts/toxcreate.js +++ b/public/javascripts/toxcreate.js @@ -119,8 +119,18 @@ $(function() { if(/^\d+$/.test(reload_id)) loadModel(reload_id, 'validation'); }; }); +//<<<<<<< HEAD //var validationCheck = setTimeout('checkValidation()',15000); - var validationCheck = setTimeout('checkValidation()',5000); + //var validationCheck = setTimeout('checkValidation()',5000); +//======= + $("input.model_validation_qmrf").each(function(){ + if(!$(this).val().match(/Completed|Error/)) { + reload_id = this.id.replace("model_validation_qmrf_",""); + if(/^\d+$/.test(reload_id)) loadModel(reload_id, 'model'); + }; + }); + var validationCheck = setTimeout('checkValidation()',15000); +//>>>>>>> d1ad229730f6e6043fe6e7a150e05ffa41e3cec2 } }); diff --git a/views/model.haml b/views/model.haml index e1bdd99..5addcb0 100644 --- a/views/model.haml +++ b/views/model.haml @@ -75,7 +75,8 @@ %em (experts) - if model.uri %dt Model: - %dd + %dd{:id => "model_qmrf_#{model.id}"} + %input{ :id => "model_validation_qmrf_#{model.id}", :type => "hidden", :value => "#{model.validation_qmrf_status}", :class => "model_validation_qmrf" } -#%a{:href => "#{model.uri}.rdf"} RDF/XML -#, - if model.validation_qmrf_uri |