From fc854f42e89aa205998fbd781b4ec6b0c7eb6b30 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <antgonza@gmail.com>
Date: Mon, 26 Sep 2016 09:00:21 -0600
Subject: [PATCH 1/2] fix #1268

---
 qiita_pet/templates/edit_study.html        |   3 +-
 qiita_pet/templates/study_base.html        |  14 +-
 qiita_pet/templates/study_description.html | 636 ---------------------
 3 files changed, 10 insertions(+), 643 deletions(-)
 delete mode 100644 qiita_pet/templates/study_description.html

diff --git a/qiita_pet/templates/edit_study.html b/qiita_pet/templates/edit_study.html
index 94a2d476f..50f474f6b 100644
--- a/qiita_pet/templates/edit_study.html
+++ b/qiita_pet/templates/edit_study.html
@@ -1,5 +1,6 @@
 {% extends sitebase.html %}
 {% block head %}
+{% set study_title = study.title.replace('"', '\\"') %}
 <script type="text/javascript" src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery.validate.min.js"></script>
 <style>
   .custom-combobox {
@@ -39,7 +40,7 @@
         request = $.ajax({
           type: "GET",
           url: '{% raw qiita_config.portal_dir %}/check_study/',
-          data: {study_title: $("#study_title")[0].value {% if study %}, old_study_title: '{{study.title}}'{% end %} }
+          data: {study_title: $("#study_title")[0].value {% if study %}, old_study_title: "{% raw study_title %}"{% end %} }
         });
 
         // callback handler that will be called on success
diff --git a/qiita_pet/templates/study_base.html b/qiita_pet/templates/study_base.html
index 5cfef561b..cca3ced0c 100644
--- a/qiita_pet/templates/study_base.html
+++ b/qiita_pet/templates/study_base.html
@@ -1,5 +1,7 @@
 {% extends sitebase.html %}
 {% block head %}
+{% set study_title = study_info['study_title'] %}
+{% set study_title_msg = study_title.replace('"', '\\"') %}
 <link rel="stylesheet" src="{% raw qiita_config.portal_dir %}/static/vendor/css/vis.css" type="text/css">
 <script type="text/javascript" src="{% raw qiita_config.portal_dir %}/static/vendor/js/vis.js"></script>
 <script type="text/javascript">
@@ -108,7 +110,7 @@
   }
 
   function validate_delete_study_text() {
-    if ($("#study-alias").val() == "{{study_info['study_title']}}") {
+    if ($("#study-alias").val() == "{% raw study_title_msg %}") {
       $('#delete-study-button').prop('disabled', false);
     } else {
       $('#delete-study-button').prop('disabled', true);
@@ -116,11 +118,11 @@
   }
 
   function delete_study() {
-    if($("#study-alias").val() != "{{study_info['study_title']}}") {
+    if($("#study-alias").val() != "{% raw study_title_msg %}") {
       alert("The entered study alias doesn't match the study");
       return false;
     }
-    else if(confirm("Are you sure you want to delete {{study_info['study_title']}}?")) {
+    else if(confirm("Are you sure you want to delete {% raw study_title_msg %}?")) {
       $.post('{% raw qiita_config.portal_dir %}/study/delete/', { study_id: {{study_info['study_id']}} })
         .done(function ( data ) {
           if(data.status == "error") {
@@ -224,7 +226,7 @@
     <!-- Study ID and study alias always on top -->
     <div class="row">
       <div class="col-md-12" id="study-base-info">
-        <h2>{{study_info['study_title']}} - ID {{study_info['study_id']}}</h2>
+        <h2>{% raw study_title %} - ID {{study_info['study_id']}}</h2>
         <h3>{{study_info['study_alias']}}</h3>
       </div>
     </div>
@@ -239,12 +241,12 @@ <h3>{{study_info['study_alias']}}</h3>
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>Deleting:<br/></h3><h4>{{study_info['study_title']}}</h4>
+        <h3>Deleting:<br/></h3><h4>{% raw study_title %}</h4>
       </div>
       <div class="modal-body">
         You will only be able to delete a study that has no data associated with it.<br/>
         To continue you need to write the title of the study:<br/>
-        <input type="text" name="study-alias" id="study-alias" onkeyup="validate_delete_study_text();" size="{{ len(study_info['study_title']) }}">
+        <input type="text" name="study-alias" id="study-alias" onkeyup="validate_delete_study_text();" size="{{ len(study_title) }}">
         <button class="btn btn-danger glyphicon glyphicon-trash" onclick="delete_study();" id="delete-study-button" disabled></button>
       </div>
       <div class="modal-footer">
diff --git a/qiita_pet/templates/study_description.html b/qiita_pet/templates/study_description.html
deleted file mode 100644
index 46d105cc0..000000000
--- a/qiita_pet/templates/study_description.html
+++ /dev/null
@@ -1,636 +0,0 @@
-{% extends sitebase.html %}
-{% block head %}
-<script>
-// Note that these two callbacks can come from the step where you are creating
-// a new prep template or when you are editing the prep template thus isEdit
-function investigationTypeChanged(rawDataID, prepDataID, isEdit){
-
-  // whether the callback comes from an edit element
-  var isEdit = isEdit !== undefined ? isEdit : false;
-
-  if (isEdit){
-    if ($('#edit-investigation-type-'+rawDataID+'-'+prepDataID).val() === 'Other'){
-      $('#edit-user-defined-investigation-types-'+rawDataID+'-'+prepDataID).show()
-    }
-    else {
-      $('#edit-user-defined-investigation-types-'+rawDataID+'-'+prepDataID).hide()
-      $('#edit-new-investigation-type-entry-'+rawDataID+'-'+prepDataID).hide()
-    }
-  }
-    else{
-    if ($('#investigation-type-'+rawDataID).val() === 'Other'){
-      $('#user-defined-investigation-types-'+rawDataID).show()
-    }
-    else {
-      $('#user-defined-investigation-types-'+rawDataID).hide()
-      $('#new-investigation-type-entry-'+rawDataID).hide()
-    }
-  }
-}
-
-function newInvestigationTypeChanged(rawDataID, prepDataID, isEdit){
-
-  // whether the callback comes from an edit element
-  var isEdit = isEdit !== undefined ? isEdit : false;
-
-  if (isEdit){
-    if ($('#edit-user-defined-investigation-type-'+rawDataID+'-'+prepDataID).val() === 'New Type'){
-      $('#edit-new-investigation-type-entry-'+rawDataID+'-'+prepDataID).show()
-    }
-    else {
-      $('#edit-new-investigation-type-entry-'+rawDataID+'-'+prepDataID).hide()
-    }
-  }
-  else{
-    if ($('#user-defined-investigation-type-'+rawDataID).val() === 'New Type'){
-      $('#new-investigation-type-entry-'+rawDataID).show()
-    }
-    else {
-      $('#new-investigation-type-entry-'+rawDataID).hide()
-    }
-  }
-}
-
-// After spending +2 hours searching through internet, the best way to post
-// to a handler is by creating a form using jquery and submitting it.
-// If we use the $.post function from jquery, which is a shortcut for the ajax
-// function, the html created on the handler is returned here as a response
-// of the call, which is not refreshing the page
-
-// Creates the form to process a sample template
-function process_sample_template() {
-  if (confirm("Are you sure you want to (re)process the sample template?")) {
-    var form = $("<form>")
-      .attr("action", window.location.href)
-      .attr("method", "post")
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "sample_template")
-        .attr("value", $("#sample_template").val()))
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "data_type")
-        .attr("value", $("#qiime_data_type").val()))
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "action")
-        .attr("value", "process_sample_template"));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-// Creates the form to update a sample template
-function update_sample_template() {
-  if (confirm("Are you sure you want to update the sample template?")) {
-    var form = $("<form>")
-      .attr("action", window.location.href)
-      .attr("method", "post")
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "sample_template")
-        .attr("value", $("#sample_template").val()))
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "action")
-        .attr("value", "update_sample_template"));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-function get_and_check_raw_data_files(prep_id, filetype){
-  var barcodes = [];
-  var forward = [];
-  var reverse = [];
-  var sff = [];
-  var fasta = [];
-  var qual = [];
-
-  var all_files = document.getElementsByName("upload_file_" + prep_id + "_" + filetype);
-
-  for (var i = 0; i < all_files.length; i++){
-    ele = all_files[i]
-    switch (ele.options[ele.selectedIndex].value) {
-      case "barcodes":
-        barcodes.push(ele.id);
-        break;
-      case "forward seqs":
-        forward.push(ele.id);
-        break;
-      case "reverse seqs":
-        reverse.push(ele.id);
-        break;
-      case "sff":
-        sff.push(ele.id);
-        break;
-      case "fasta":
-        fasta.push(ele.id);
-        break;
-      case "qual":
-        qual.push(ele.id);
-        break;
-    }
-  }
-  if (sff.length === 0 && barcodes.length === 0 && forward.length === 0 && fasta.length === 0) {
-    bootstrapAlert("You need to select at least: one barcode and one forward file, one sff file or one fasta file.");
-    return [false];
-  } else if (sff.length === 0 && barcodes.length != forward.length && filetype !== 5 && filetype != "per_sample_FASTQ") {
-    bootstrapAlert("You must select the same number of barcode and forward seq files.");
-    return [false];
-  } else if (sff.length === 0 && (reverse.length !== 0 && reverse.length != forward.length)) {
-    bootstrapAlert("If you select reverse seqs, they should have the same number than barcodes and forward files.");
-    return [false];
-  } else if (sff.length === 0 && (qual.length !== 0 && fasta.length != qual.length)) {
-    bootstrapAlert("If you select qual, you must have the same number of fasta and qual files.");
-    return [false];
-  } else {
-    return [true, barcodes, forward, reverse, sff, fasta, qual];
-  }
-};
-
-function create_raw_data(prep_id, filetype){
-  var result = get_and_check_raw_data_files(prep_id, filetype);
-  var success = result[0];
-
-  if (success){
-    var barcodes = result[1];
-    var forward = result[2];
-    var reverse = result[3];
-    var sff = result[4];
-    var fasta = result[5];
-    var qual = result[6];
-
-    var form = $("<form>")
-    .attr("action", "{% raw qiita_config.portal_dir %}/study/create_raw_data")
-    .attr("method", "post")
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "prep_template_id")
-      .attr("value", prep_id))
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "filetype")
-      .attr("value", filetype))
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "barcodes")
-      .attr("value", barcodes.join()))
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "forward")
-      .attr("value", forward.join()))
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "sff")
-      .attr("value", sff.join()))
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "fasta")
-      .attr("value", fasta.join()))
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "qual")
-      .attr("value", qual.join()))
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "reverse")
-      .attr("value", reverse.join()));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-function add_raw_data(prep_id) {
-  raw_data_id = $("#previous-raw-data-" + prep_id).val();
-  if (raw_data_id === null){
-    bootstrapAlert("You need to select a raw data used in a previous study");
-  } else {
-    var form = $("<form>")
-      .attr("action", "{% raw qiita_config.portal_dir %}/study/create_raw_data")
-      .attr("method", "post")
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "artifact_id")
-        .attr("value", raw_data_id))
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "prep_template_id")
-        .attr("value", prep_id));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-function add_prep_template() {
-  var form = $("<form>")
-    .attr("action", window.location.href)
-    .attr("method", "post")
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "prep_template")
-      .attr("value", $("#add_prep_template").val()))
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "investigation-type")
-      .attr("value", $("#investigation-type-new").val()))
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "user-defined-investigation-type")
-      .attr("value", $("#user-defined-investigation-type-new").val()))
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "new-investigation-type")
-      .attr("value", $("#new-investigation-type-new").val()))
-    .append($("<input>")
-      .attr("type", "hidden")
-      .attr("name", "data_type_id")
-      .attr("value", $("#data_type").val()))
-    .append($("<input>")
-          .attr("type", "hidden")
-          .attr("name", "action")
-          .attr("value", "add_prep_template"));
-  $("body").append(form);
-  form.submit();
-}
-
-function update_prep_template(pt_id) {
-  if (confirm("Are you sure you want to update the prep template?")) {
-    var form = $("<form>")
-      .attr("action", window.location.href)
-      .attr("method", "post")
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "prep_template_id")
-        .attr("value", pt_id))
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "update_prep_template_file")
-        .attr("value", $("#update_prep_template_" + pt_id).val()))
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "action")
-        .attr("value", "update_prep_template"));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-function validate_delete_study_text() {
-  if ($("#study-alias").val() == "{{study_alias}}") {
-    $('#delete-study-button').prop('disabled', false);
-  } else {
-    $('#delete-study-button').prop('disabled', true);
-  }
-}
-
-function delete_study() {
-  if ($("#study-alias").val() != "{{study_alias}}") {
-    alert("The added name doesn't match the study alias");
-    return false;
-  }
-  if (confirm('Are you sure you want to delete "{{study_title}}"?')) {
-    var form = $("<form>")
-    .attr("action", window.location.href)
-    .attr("method", "post")
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "study_id")
-    .attr("value", {{study.id}}))
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "action")
-    .attr("value", "delete_study"));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-function delete_sample_template() {
-  sample_template_id = {{study.id}};
-  if (confirm('Are you sure you want to delete sample template ID: ' + sample_template_id + '?')) {
-    var form = $("<form>")
-    .attr("action", window.location.href)
-    .attr("method", "post")
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "sample_template_id")
-    .attr("value", sample_template_id))
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "action")
-    .attr("value", "delete_sample_template"));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-function delete_raw_data(raw_data_filetype, raw_data_id, prep_template_id) {
-  if (confirm('Are you sure you want to delete raw data: ' + raw_data_filetype + ' (ID: ' + raw_data_id + ')?')) {
-    var form = $("<form>")
-    .attr("action", window.location.href)
-    .attr("method", "post")
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "raw_data_id")
-    .attr("value", raw_data_id))
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "prep_template_id")
-    .attr("value", prep_template_id))
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "action")
-    .attr("value", "delete_raw_data"));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-function delete_prep_template(data_type, prep_template_id) {
-  if (confirm('Are you sure you want to delete prep template: ' + data_type + ' (ID: ' + prep_template_id + ')?')) {
-    var form = $("<form>")
-    .attr("action", window.location.href)
-    .attr("method", "post")
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "prep_template_id")
-    .attr("value", prep_template_id))
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "action")
-    .attr("value", "delete_prep_template"));
-    $("body").append(form);
-    form.submit();
-  } else {
-    return false;
-  }
-}
-
-function delete_preprocessed_data(preprocessed_data_id) {
-  if (confirm('Are you sure you want to delete preprocessed data ID: ' + preprocessed_data_id + '?')) {
-    var form = $("<form>")
-    .attr("action", window.location.href)
-    .attr("method", "post")
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "preprocessed_data_id")
-    .attr("value", preprocessed_data_id))
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "action")
-    .attr("value", "delete_preprocessed_data"));
-    $("body").append(form);
-    form.submit();
-  } else {
-    return false;
-  }
-}
-
-function delete_processed_data(processed_data_id) {
-  if (confirm('Are you sure you want to delete processed data ID: ' + processed_data_id + '?')) {
-    var form = $("<form>")
-    .attr("action", window.location.href)
-    .attr("method", "post")
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "processed_data_id")
-    .attr("value", processed_data_id))
-    .append($("<input>")
-    .attr("type", "hidden")
-    .attr("name", "action")
-    .attr("value", "delete_processed_data"));
-    $("body").append(form);
-    form.submit();
-  } else {
-    return false;
-  }
-}
-
-function make_public(pd_id) {
-  if (confirm("Are you sure you want to make this study public?")) {
-    var form = $("<form>")
-      .attr("action", window.location.href)
-      .attr("method", "post")
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "action")
-        .attr("value", "make_public"))
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "pd_id")
-        .attr("value", pd_id));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-function approve_study(pd_id) {
-  if (confirm("Are you sure you want to approve this study?")) {
-    var form = $("<form>")
-      .attr("action", window.location.href)
-      .attr("method", "post")
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "action")
-        .attr("value", "approve_study"))
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "pd_id")
-        .attr("value", pd_id));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-function request_approval(pd_id) {
-  if (confirm("Are you sure you want to ask for approval? IMPORTANT: This will not allow you to add any new raw data or modifications to this study")) {
-    var form = $("<form>")
-      .attr("action", window.location.href)
-      .attr("method", "post")
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "action")
-        .attr("value", "request_approval"))
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "pd_id")
-        .attr("value", pd_id));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-function make_sandbox(pd_id) {
-  if (confirm("Are you sure you want to revert to sandbox status?")) {
-    var form = $("<form>")
-      .attr("action", window.location.href)
-      .attr("method", "post")
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "action")
-        .attr("value", "make_sandbox"))
-      .append($("<input>")
-        .attr("type", "hidden")
-        .attr("name", "pd_id")
-        .attr("value", pd_id));
-    $("body").append(form);
-    form.submit();
-  }
-}
-
-function update_investigation_type(old_value, prep_template_id, ppd_id) {
-  if (confirm("Are you sure you want to update the investigation type?")) {
-      var form = $("<form>")
-        .attr("action", window.location.href)
-        .attr("method", "post")
-        .append($("<input>")
-          .attr("type", "hidden")
-          .attr("name", "prep_id")
-          .attr("value", prep_template_id))
-        .append($("<input>")
-          .attr("type", "hidden")
-          .attr("name", "edit-user-defined-investigation-type")
-          .attr("value", $("#edit-user-defined-investigation-type-" + prep_template_id + "-" + ppd_id).val()))
-        .append($("<input>")
-          .attr("type", "hidden")
-          .attr("name", "edit-new-investigation-type")
-          .attr("value", $("#edit-new-investigation-type-" + prep_template_id + "-" + ppd_id).val()))
-        .append($("<input>")
-          .attr("type", "hidden")
-          .attr("name", "edit-investigation-type")
-          .attr("value", $("#edit-investigation-type-" + prep_template_id + "-" + ppd_id).val()))
-        .append($("<input>")
-          .attr("type", "hidden")
-          .attr("name", "ppd_id")
-          .attr("value", ppd_id))
-        .append($("<input>")
-          .attr("type", "hidden")
-          .attr("name", "action")
-          .attr("value", "update_investigation_type"));
-      $("body").append(form);
-      form.submit();
-  } else {
-    $("#investigation_type_prep_" + prep_template_id).val(old_value);
-  }
-}
-
-function submit_preprocess(id) {
-  if ($("#preprocessing_parameters_" + id).children(":selected").attr("value") === "0") {
-    $("#display-extra-info-" + id).html('You need to select a valid preprocessing parameter to continue');
-    return false;
-  }
-  return true;
-};
-
-function display_tab(top_tab, sub_tab, prep_tab){
-  // making sure the last tab is always the default
-  $('#prep_template_nav_tabs a:last').tab('show');
-  $('#preprocessed_data_tab li:eq(1) a').tab('show');
-  $('#processed_data_tab li:eq(1) a').tab('show');
-
-  $('#myTab a[href="#'+top_tab+'"]').tab('show');
-  if (top_tab == "prep_template_tab"){
-    if (sub_tab !== undefined){
-      $('#prep_template_nav_tabs a[href="#prep_template_info_'+sub_tab+'"]').tab('show')
-    }
-  }
-  else if (top_tab == "preprocessed_data_tab"){
-    if (sub_tab !== undefined){
-      $('#preprocessed_data_nav_tabs a[href="#preprocessed_data_info_'+sub_tab+'"]').tab('show')
-    }
-  }
-  else if (top_tab == "processed_data_tab"){
-    if (sub_tab !== undefined){
-      $('#processed_data_nav_tabs a[href="#processed_data_info_'+sub_tab+'"]').tab('show')
-    }
-  }
-}
-
-$(document).ready(function() {
-  $("#previous_raw_data").chosen({width: "100%"});
-  display_tab({% if top_tab %} "{{top_tab}}" {% end %}
-              {% if sub_tab %}
-                , "{{sub_tab}}"
-                {% if prep_tab %}
-                 , "{{prep_tab}}"
-                {% end %}
-              {% end %})
-  $('.filesgroup').hide();
-});
-
-</script>
-
-{% end %} <!-- End head block -->
-
-
-{% block content %}
-
-
-<table border="0" style="vertical-align: middle; text-align:center; align:center;">
-  <tr>
-    <td style="vertical-align: middle; text-align:left; width: 50%;" colspan="2">
-      <h1>{{study_title}} </h1>
-      <h2><i>{{study_alias}}</i></h2>
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: middle; text-align:left; width: 50%;" colspan="2">
-      {% if show_edit_btn %}
-        <a class="btn btn-default glyphicon glyphicon-edit" href="{% raw qiita_config.portal_dir %}/study/edit/{{study.id}}" title="Edit the study information" style="margin:5px; word-spacing: -10px;"> Edit</a>
-      {% end %}
-      <a href="{% raw qiita_config.portal_dir %}/study/upload/{{study.id}}" class="btn btn-default glyphicon glyphicon-upload" title="Upload study files" style="margin:5px; word-spacing: -10px;"> Upload</a>
-      <a class="btn btn-danger glyphicon glyphicon-trash" style="display: inline-block;" data-toggle="modal" data-target="#delete-study"> Delete-study</a>
-    </td>
-  </tr>
-</table>
-
-<br/>
-
-<!-- Nav tabs -->
-<ul class="nav nav-tabs" role="tablist" id="myTab">
-    <li class="active">
-      <a href="#study_information_tab" role="tab" data-toggle="tab">Study information</a>
-    </li>
-  {% if show_data_tabs %}
-    <li><a href="#prep_template_tab" role="tab" data-toggle="tab">Prep templates</a></li>
-    <li><a href="#preprocessed_data_tab" role="tab" data-toggle="tab">Preprocessed data</a></li>
-    <li><a href="#processed_data_tab" role="tab" data-toggle="tab">Processed data</a></li>
-  {% end %}
-</ul>
-
-<!-- Tab panes -->
-<div class="tab-content">
-  <!-- Show the study information tab -->
-  {% module StudyInformationTab(study) %}
-  {% if show_data_tabs %}
-    <!-- Show the raw data tab -->
-    {% module PrepTemplateTab(study, full_access) %}
-    <!-- Show the preprocessed data tab -->
-    {% module PreprocessedDataTab(study, full_access) %}
-    <!-- Show the processed data tab -->
-    {% module ProcessedDataTab(study, full_access, allow_approval, approval_deny_msg) %}
-  {% end %}
-</div>
-
-
-<div class="modal fade delete-study" tabindex="-1" role="dialog" id="delete-study">
-  <div class="modal-dialog modal-sm">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>Deleting:<br/></h3><h4>{{study_title}}</h4>
-      </div>
-      <div class="modal-body">
-        You will only be able to delete a study that has no data associated with it.
-      </div>
-      <div class="modal-footer">
-        To continue you need to write the alias name of the study:
-        <input type="text" name="study-alias" id="study-alias" onkeyup="validate_delete_study_text();">
-        <button class="btn btn-danger glyphicon glyphicon-trash" onclick="delete_study();" id="delete-study-button" disabled></button>
-      </div>
-    </div>
-  </div>
-</div>
-
-{% end %}

From 4cce0d3e45aa0b2540a37616bb60f75b84057848 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <antgonza@gmail.com>
Date: Mon, 26 Sep 2016 09:38:16 -0600
Subject: [PATCH 2/2] fixing tests

---
 qiita_pet/templates/edit_study.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qiita_pet/templates/edit_study.html b/qiita_pet/templates/edit_study.html
index 50f474f6b..44dd1bbc7 100644
--- a/qiita_pet/templates/edit_study.html
+++ b/qiita_pet/templates/edit_study.html
@@ -1,6 +1,5 @@
 {% extends sitebase.html %}
 {% block head %}
-{% set study_title = study.title.replace('"', '\\"') %}
 <script type="text/javascript" src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery.validate.min.js"></script>
 <style>
   .custom-combobox {
@@ -40,7 +39,7 @@
         request = $.ajax({
           type: "GET",
           url: '{% raw qiita_config.portal_dir %}/check_study/',
-          data: {study_title: $("#study_title")[0].value {% if study %}, old_study_title: "{% raw study_title %}"{% end %} }
+          data: {study_title: $("#study_title")[0].value {% if study %}, old_study_title: "{% raw study.title.replace('"', '\\"') %}"{% end %} }
         });
 
         // callback handler that will be called on success