Skip to content

Fix 2230 #2372

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 9 commits into from
Oct 23, 2017
Merged

Fix 2230 #2372

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cc97e89
fix calls to system_call and ebi submissions
antgonza Oct 12, 2017
292e193
fixing errors
antgonza Oct 12, 2017
6a553f6
fix if state == submitting:
antgonza Oct 12, 2017
f27c230
just raise error
antgonza Oct 12, 2017
d721f85
EBISubmissionError -> ComputeError
antgonza Oct 12, 2017
9e10d9c
Merge pull request #2345 from biocore/fix-ebi-1012
josenavas Oct 14, 2017
d5636ae
Fix #2230 solved using modal in order to prevent large file download
Oct 21, 2017
29da4e4
fix conflicts
danteese Oct 21, 2017
7ef56fa
Function moved into in order to keep order. Some details fixed.
danteese Oct 23, 2017
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
Prev Previous commit
Function moved into in order to keep order. Some details fixed.
  • Loading branch information
@danteese
danteese committed Oct 23, 2017
commit 7ef56fa2ff55382fb83d9702d314dfbe36cf1409
23 changes: 10 additions & 13 deletions qiita_pet/templates/sitebase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,12 @@
});
});

$('#qiita_download_accept').click(function(e){
e.preventDefault();
$('.qiita_pet_download_confirm').modal('hide');
window.location.href = '{% raw qiita_config.portal_dir %}/release/download/public';
});

// Based on http://codepen.io/willvincent/pen/LbeKKW
// and https://datatables.net/examples/api/row_details.html

Expand Down Expand Up @@ -555,11 +561,11 @@ <h6>
<a href="#" data-toggle="dropdown" class="dropdown-toggle">Downloads<b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<a type="button" data-toggle="modal" data-target=".qiita_pet_dwnld_confirm">
<a type="button" data-toggle="modal" data-target=".qiita_pet_download_confirm">
Public BIOM and metadata files
<small>
<br/><b>MD5:</b> {{public_md5}}
<br/><b>Last update:</b>{{public_timestamp}}
<br/><b>Last update:</b> {{public_timestamp}}
</small>
</a>
</li>
Expand All @@ -570,7 +576,7 @@ <h6>
</div>
</div> <!--/.main nav-bar -->

<div class="modal fade qiita_pet_dwnld_confirm" tabindex="-1" role="dialog" aria-labelledby="Confirm download">
<div class="modal fade qiita_pet_download_confirm" tabindex="-1" role="dialog" aria-labelledby="Confirm download">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
Expand All @@ -582,21 +588,12 @@ <h4 class="modal-title">File really big.</h4>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">No</button>
<button type="button" class="btn btn-success" id="qiita_dwnld_accept">Yes</button>
<button type="button" class="btn btn-success" id="qiita_download_accept">Yes</button>
</div>
<!-- href="{% raw qiita_config.portal_dir %}/release/download/public" -->
</div>
</div>
</div>

<script type="text/javascript">
$('#qiita_dwnld_accept').click(function(e){
e.preventDefault();
$('.qiita_pet_dwnld_confirm').modal('hide');
window.location.href = '{% raw qiita_config.portal_dir %}/release/download/public';
});
</script>


{% if message != '' %}
{% if level not in {'danger', 'success', 'info', 'warning'} %}
Expand Down