diff options
| author | mr <mr@mrautenberg.de> | 2011-08-22 15:31:41 +0200 |
|---|---|---|
| committer | mr <mr@mrautenberg.de> | 2011-08-22 15:31:41 +0200 |
| commit | 4fc732ca31b07ba1469358836abf6ffd3c955098 (patch) | |
| tree | 8e399db137fcab52d1e01b00aea9c7b6926886c1 | |
| parent | c71f69b610b270b9c25cf58e84a035078905fa46 (diff) | |
| parent | 8656f259932b03c3ddf7f5eff755d70ab7fbe3eb (diff) | |
Merge branch 'development' of github.com:opentox/toxcreate into development
| -rw-r--r-- | views/classification_validation.haml | 4 | ||||
| -rw-r--r-- | views/model.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/views/classification_validation.haml b/views/classification_validation.haml index 9f5c2c9..47e1f75 100644 --- a/views/classification_validation.haml +++ b/views/classification_validation.haml @@ -32,7 +32,7 @@ %th{:bgcolor => "#CCD2DC"} = cm[1][i] - else - %td= cm[1][i] + %td= cm[1][i].to_i - if cm.size > 2 - (2..cm.size-1).each do |i| %tr @@ -41,4 +41,4 @@ %th{:bgcolor => "#CCD2DC"} = cm[i][j] - else - %td= cm[i][j] + %td= cm[i][j].to_i diff --git a/views/model.haml b/views/model.haml index 670ba1a..356ec65 100644 --- a/views/model.haml +++ b/views/model.haml @@ -29,9 +29,9 @@ - if is_authorized(model.web_uri, "DELETE") %a{:href => url_for("/model/#{model.id}"), :id => "delete_#{model.id}", :class => 'delete_link'} - if model.status =~ /Completed|Error|Cancelled/ - (delete) + (delete) - else - (stop) + (stop) %span %br |