Skip to content
Browse files

Merge pull request #170 from jaredbischof/develop

Fixed values of files listed in Inbox.
  • Loading branch information...
2 parents 472cf60 + 992fe44 commit 238563cd66be7adc64d8c0a65b6c8fef8e16e943 @jaredbischof jaredbischof committed Nov 28, 2012
Showing with 9 additions and 6 deletions.
  1. +4 −4 src/MGRAST/html/js/Upload.js
  2. +5 −2 src/WebApplication/WebComponent/js/Table.js
View
8 src/MGRAST/html/js/Upload.js
@@ -108,13 +108,13 @@ function update_inbox (data, files, action) {
error_msg = DataStore['user_inbox'][user.login].computation_error_log[flist[i]];
}
if ((seq_dlist[dlist[i]] == 1) && inf['file type'] && (inf['file type'] == 'malformed')) {
- inbox_html += "<option style='color: red;'>(invalid seq file) "+flist[i]+"</option>";
+ inbox_html += "<option style='color: red;' value='"+flist[i]+"'>(invalid seq file) "+flist[i]+"</option>";
} else if (isSeq && inf['Error']) {
- inbox_html += "<option style='color: red;'>(seq stats error) "+flist[i]+"</option>";
+ inbox_html += "<option style='color: red;' value='"+flist[i]+"'>(seq stats error) "+flist[i]+"</option>";
} else if (isSeq && inf['unique id count'] && inf['sequence count'] && (inf['unique id count'] != inf['sequence count'])) {
- inbox_html += "<option style='color: red;'>(non-unique seq IDs) "+flist[i]+"</option>";
+ inbox_html += "<option style='color: red;' value='"+flist[i]+"'>(non-unique seq IDs) "+flist[i]+"</option>";
} else if (isSeq && inf['bp count'] && inf['bp count'] <= BP_CUTOFF) {
- inbox_html += "<option style='color: red;'>(seq file too small) "+flist[i]+"</option>";
+ inbox_html += "<option style='color: red;' value='"+flist[i]+"'>(seq file too small) "+flist[i]+"</option>";
} else if (lock_msg != "") {
inbox_html += "<option style='color: gray;' value='"+flist[i]+"'>("+lock_msg+") "+flist[i]+"</option>";
} else if (error_msg != "") {
View
7 src/WebApplication/WebComponent/js/Table.js
@@ -212,8 +212,11 @@ function export_table (id, unfiltered, strip_html, hide_invisible_columns) {
}
data_string = data_string + curr_line.join("\t") + "\n";
}
- var noapo = new RegExp("'","g");
- data_string = data_string.replace(noapo, "&#39;");
+ // If we're not stripping out HTML, then replace apostrophe with HTML apostrophe code.
+ if (! strip_html) {
+ var noapo = new RegExp("'","g");
+ data_string = data_string.replace(noapo, "&#39;");
+ }
var dform = document.createElement("form");
dform.setAttribute("method", "post");
dform.setAttribute("action", dcgiPath());

0 comments on commit 238563c

Please sign in to comment.
Something went wrong with that request. Please try again.