Skip to content

fixing bugs found during initial review #2596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 25, 2018
Merged

fixing bugs found during initial review #2596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qiita_pet/static/js/sampleTemplateVue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function get_column_summary(portal, column, numSamples){
if (row.is(":hidden")) {
var cell = $(row.children()[0]);
cell.html('<img src="' + portal + '/static/img/waiting.gif" style="display:block;margin-left: auto;margin-right: auto"/>');
$.get(portal + '/study/description/sample_template/columns/', {study_id: 1, column: column}, function(data) {
$.get(portal + '/study/description/sample_template/columns/', {study_id: vm.studyId, column: column}, function(data) {
cell.html('');
var values = data['values'];
var uniques = $.unique($.extend(true, [], data['values']));
Expand Down
1 change: 1 addition & 0 deletions qiita_pet/templates/list_studies.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
$('#user-studies-table').dataTable({
"lengthMenu": [[5, 10, 50, -1], [5, 10, 50, "All"]],
"deferRender": true,
"sDom": '<"top">rti<"bottom"p>',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this <"bottom"p> syntax. but if this is ok, then the rest looks fine

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The syntax comes from: http://legacy.datatables.net/usage/options, but the screenshot shows the differences.

"columns": [
{ "orderable": false, "data": "artifact_biom_ids" },
{ "data": "study_title" },
Expand Down
20 changes: 10 additions & 10 deletions qiita_ware/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,18 @@ def submit_EBI(artifact_id, action, send, test=False):
ebi_submission.generate_xml_files()

if send:
# getting aspera's password
old_ascp_pass = environ.get('ASPERA_SCP_PASS', '')
if old_ascp_pass == '':
environ['ASPERA_SCP_PASS'] = qiita_config.ebi_seq_xfer_pass
ascp_passwd = environ['ASPERA_SCP_PASS']
environ['ASPERA_SCP_PASS'] = old_ascp_pass
LogEntry.create('Runtime',
('Submission of sequences of pre_processed_id: '
'%d completed successfully' % artifact_id))

# step 4: sending sequences
if action != 'MODIFY':
old_ascp_pass = environ.get('ASPERA_SCP_PASS', '')
if old_ascp_pass == '':
environ['ASPERA_SCP_PASS'] = qiita_config.ebi_seq_xfer_pass

LogEntry.create('Runtime',
("Submitting sequences for pre_processed_id: "
"%d" % artifact_id))
Expand All @@ -71,12 +77,6 @@ def submit_EBI(artifact_id, action, send, test=False):
open(ebi_submission.ascp_reply, 'a').write(
'stdout:\n%s\n\nstderr: %s' % (stdout, stderr))

ascp_passwd = environ['ASPERA_SCP_PASS']
environ['ASPERA_SCP_PASS'] = old_ascp_pass
LogEntry.create('Runtime',
('Submission of sequences of pre_processed_id: '
'%d completed successfully' % artifact_id))

# step 5: sending xml and parsing answer
xmls_cmds = ebi_submission.generate_curl_command(
ebi_seq_xfer_pass=ascp_passwd)
Expand Down